diff --git a/README.md b/README.md
index c9b9d84e..c44d5f9a 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ If you are experiencing issues, please make sure you have the latest versions.
### Install External Dependencies
-> **NOTE**
+> **NOTE**
> [Backup](#FAQ) your previous configuration (if any exists)
External Requirements:
@@ -43,6 +43,8 @@ Neovim's configurations are located under the following paths, depending on your
| Windows (cmd)| `%userprofile%\AppData\Local\nvim\` |
| Windows (powershell)| `$env:USERPROFILE\AppData\Local\nvim\` |
+### Install Kickstart
+
Clone kickstart.nvim:
Linux and Mac
@@ -58,13 +60,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
If you're using `cmd.exe`:
```
-git clone https://github.com/nvim-lua/kickstart.nvim.git %userprofile%\AppData\Local\nvim\
+git clone https://github.com/nvim-lua/kickstart.nvim.git %userprofile%\AppData\Local\nvim\
```
If you're using `powershell.exe`
```
-git clone https://github.com/nvim-lua/kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
+git clone https://github.com/nvim-lua/kickstart.nvim.git $env:USERPROFILE\AppData\Local\nvim\
```
Adding autopairs
@@ -192,3 +194,21 @@ This requires:
```lua
{'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
```
+
+Alternatively one can install gcc and make which don't require changing the config,
+the easiest way is to use choco:
+
+1. install [chocolatey](https://chocolatey.org/install)
+either follow the instructions on the page or use winget,
+run in cmd as **admin**:
+```
+winget install --accept-source-agreements chocolatey.chocolatey
+```
+
+2. install all requirements using choco, exit previous cmd and
+open a new one so that choco path is set, run in cmd as **admin**:
+```
+choco install -y neovim git ripgrep wget fd unzip gzip mingw make
+```
+
+Then continue with the [Install Kickstart](#Install-Kickstart) step.
diff --git a/init.lua b/init.lua
index 7ab9039c..16d3c26b 100644
--- a/init.lua
+++ b/init.lua
@@ -96,10 +96,10 @@ vim.g.maplocalleader = ' '
-- For more options, you can see `:help option-list`
-- Make line numbers default
---vim.opt.number = true
+vim.opt.number = true
-- You can also add relative line numbers, for help with jumping.
-- Experiment for yourself to see if you like it!
-vim.opt.relativenumber = true
+-- vim.opt.relativenumber = true
-- Enable mouse mode, can be useful for resizing splits for example!
vim.opt.mouse = 'a'
@@ -134,8 +134,8 @@ vim.opt.splitright = true
vim.opt.splitbelow = true
-- Sets how neovim will display certain whitespace in the editor.
--- See :help 'list'
--- and :help 'listchars'
+-- See `:help 'list'`
+-- and `:help 'listchars'`
vim.opt.list = true
vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
@@ -185,7 +185,7 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the lower win
vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' })
-- [[ Basic Autocommands ]]
--- See :help lua-guide-autocommands
+-- See `:help lua-guide-autocommands`
-- Highlight when yanking (copying) text
-- Try it with `yap` in normal mode
@@ -218,8 +218,7 @@ vim.opt.rtp:prepend(lazypath)
-- :Lazy update
--
-- NOTE: Here is where you install your plugins.
-require('lazy').setup({
-
+require('lazy').setup {
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
@@ -259,10 +258,10 @@ require('lazy').setup({
-- lazy loading plugins that don't need to be loaded immediately at startup.
--
-- For example, in the following configuration, we use:
- -- event = 'VeryLazy'
+ -- event = 'VimEnter'
--
- -- which loads which-key after all the UI elements are loaded. Events can be
- -- normal autocommands events (:help autocomd-events).
+ -- which loads which-key before all the UI elements are loaded. Events can be
+ -- normal autocommands events (`:help autocmd-events`).
--
-- Then, because we use the `config` key, the configuration only runs
-- after the plugin has been loaded:
@@ -270,7 +269,7 @@ require('lazy').setup({
{ -- Useful plugin to show you pending keybinds.
'folke/which-key.nvim',
- event = 'VeryLazy', -- Sets the loading event to 'VeryLazy'
+ event = 'VimEnter', -- Sets the loading event to 'VimEnter'
config = function() -- This is the function that runs, AFTER loading
require('which-key').setup()
@@ -294,7 +293,7 @@ require('lazy').setup({
{ -- Fuzzy Finder (files, lsp, etc)
'nvim-telescope/telescope.nvim',
- event = 'VeryLazy',
+ event = 'VimEnter',
branch = '0.1.x',
dependencies = {
'nvim-lua/plenary.nvim',
@@ -435,7 +434,7 @@ require('lazy').setup({
-- Neovim. This is where `mason` and related plugins come into play.
--
-- If you're wondering about lsp vs treesitter, you can check out the wonderfully
- -- and elegantly composed help section, :help lsp-vs-treesitter
+ -- and elegantly composed help section, `:help lsp-vs-treesitter`
-- This function gets run when an LSP attaches to a particular buffer.
-- That is to say, every time a new file is opened that is associated with
@@ -532,7 +531,7 @@ require('lazy').setup({
-- - settings (table): Override the default settings passed when initializing the server.
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
local servers = {
- clangd = {},
+ -- clangd = {},
-- gopls = {},
-- pyright = {},
-- rust_analyzer = {},
@@ -563,6 +562,9 @@ require('lazy').setup({
-- If lua_ls is really slow on your computer, you can try this instead:
-- library = { vim.env.VIMRUNTIME },
},
+ completion = {
+ callSnippet = 'Replace',
+ },
-- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-- diagnostics = { disable = { 'missing-fields' } },
},
@@ -590,15 +592,11 @@ require('lazy').setup({
handlers = {
function(server_name)
local server = servers[server_name] or {}
- require('lspconfig')[server_name].setup {
- cmd = server.cmd,
- settings = server.settings,
- filetypes = server.filetypes,
- -- This handles overriding only values explicitly passed
- -- by the server configuration above. Useful when disabling
- -- certain features of an LSP (for example, turning off formatting for tsserver)
- capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}),
- }
+ -- This handles overriding only values explicitly passed
+ -- by the server configuration above. Useful when disabling
+ -- certain features of an LSP (for example, turning off formatting for tsserver)
+ server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
+ require('lspconfig')[server_name].setup(server)
end,
},
}
@@ -736,7 +734,7 @@ require('lazy').setup({
},
-- Highlight todo, notes, etc in comments
- { 'folke/todo-comments.nvim', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
+ { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
{ -- Collection of various small independent plugins/modules
'echasnovski/mini.nvim',
@@ -744,7 +742,7 @@ require('lazy').setup({
-- Better Around/Inside textobjects
--
-- Examples:
- -- - va) - [V]isually select [A]round [)]parenthen
+ -- - va) - [V]isually select [A]round [)]paren
-- - yinq - [Y]ank [I]nside [N]ext [']quote
-- - ci' - [C]hange [I]nside [']quote
require('mini.ai').setup { n_lines = 500 }
@@ -759,7 +757,16 @@ require('lazy').setup({
-- Simple and easy statusline.
-- You could remove this setup call if you don't like it,
-- and try some other statusline plugin
- require('mini.statusline').setup()
+ local statusline = require 'mini.statusline'
+ statusline.setup()
+
+ -- You can configure sections in the statusline by overriding their
+ -- default behavior. For example, here we set the section for
+ -- cursor location to LINE:COLUMN
+ ---@diagnostic disable-next-line: duplicate-set-field
+ statusline.section_location = function()
+ return '%2l:%-2v'
+ end
-- ... and there is more!
-- Check out: https://github.com/echasnovski/mini.nvim
@@ -784,7 +791,7 @@ require('lazy').setup({
-- There are additional nvim-treesitter modules that you can use to interact
-- with nvim-treesitter. You should go explore a few and see what interests you:
--
- -- - Incremental selection: Included, see :help nvim-treesitter-incremental-selection-mod
+ -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
-- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
-- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
end,
@@ -806,9 +813,9 @@ require('lazy').setup({
-- This is the easiest way to modularize your config.
--
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
- -- For additional information see: :help lazy.nvim-lazy.nvim-structuring-your-plugins
- { import = 'custom.plugins' },
-}, {})
+ -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
+ -- { import = 'custom.plugins' },
+}
-- The line beneath this is called `modeline`. See `:help modeline`
-- vim: ts=2 sts=2 sw=2 et
diff --git a/lua/kickstart/health.lua b/lua/kickstart/health.lua
index 957204e8..04df77b3 100644
--- a/lua/kickstart/health.lua
+++ b/lua/kickstart/health.lua
@@ -6,15 +6,16 @@
--]]
local check_version = function()
+ local verstr = string.format('%s.%s.%s', vim.version().major, vim.version().minor, vim.version().patch)
if not vim.version.cmp then
- vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", tostring(vim.version())))
+ vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
return
end
if vim.version.cmp(vim.version(), { 0, 9, 4 }) >= 0 then
- vim.health.ok(string.format("Neovim version is: '%s'", tostring(vim.version())))
+ vim.health.ok(string.format("Neovim version is: '%s'", verstr))
else
- vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", tostring(vim.version())))
+ vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
end
end