From 164cedf2124b63aca67573c3c1d1365d27aab750 Mon Sep 17 00:00:00 2001 From: Richard Macklin <1863540+rmacklin@users.noreply.github.com> Date: Tue, 10 Mar 2026 11:33:34 -0700 Subject: [PATCH 01/12] Revise comment for lazy-lock.json in .gitignore This is a follow-up to df9436c0e57425a43b527c3ee1d63c98af3b6768 to hopefully make things even clearer. Co-authored-by: Ori Perry --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3bec00f5..68486fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,10 @@ nvim spell/ -# You likely want to comment this, since it's recommended to track lazy-lock.json in version -# control, see https://lazy.folke.io/usage/lockfile -# For kickstart, it makes sense to leave it ignored. +# In your personal fork, you likely want to comment this, since it's recommended to track +# lazy-lock.json in version control - see https://lazy.folke.io/usage/lockfile +# For the official `nvim-lua/kickstart.nvim` git repository, we leave it ignored to avoid unneeded +# merge conflicts. lazy-lock.json .DS_Store From 8ac4b12632bea46cfa319bd799a6bbddca15bf45 Mon Sep 17 00:00:00 2001 From: Ori Perry Date: Fri, 20 Mar 2026 21:59:19 +0200 Subject: [PATCH 02/12] Refactor treesitter attach code --- init.lua | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/init.lua b/init.lua index ed50b69d..239dbad6 100644 --- a/init.lua +++ b/init.lua @@ -874,8 +874,28 @@ require('lazy').setup({ branch = 'main', -- [[ Configure Treesitter ]] See `:help nvim-treesitter-intro` config = function() + -- ensure basic parser are installed local parsers = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' } require('nvim-treesitter').install(parsers) + + ---@param buf integer + ---@param language string + local function treesitter_try_attach(buf, language) + -- check if parser exists and load it + if not vim.treesitter.language.add(language) then return end + -- enables syntax highlighting and other treesitter features + vim.treesitter.start(buf, language) + + -- enables treesitter based folds + -- for more info on folds see `:help folds` + -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' + -- vim.wo.foldmethod = 'expr' + + -- enables treesitter based indentation + vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + end + + local available_parsers = require('nvim-treesitter').get_available() vim.api.nvim_create_autocmd('FileType', { callback = function(args) local buf, filetype = args.buf, args.match @@ -883,18 +903,7 @@ require('lazy').setup({ local language = vim.treesitter.language.get_lang(filetype) if not language then return end - -- check if parser exists and load it - if not vim.treesitter.language.add(language) then return end - -- enables syntax highlighting and other treesitter features - vim.treesitter.start(buf, language) - - -- enables treesitter based folds - -- for more info on folds see `:help folds` - -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' - -- vim.wo.foldmethod = 'expr' - - -- enables treesitter based indentation - vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + treesitter_try_attach(buf, language) end, }) end, From e01e1eb8f8f6b37bad005d770046174a7918cc78 Mon Sep 17 00:00:00 2001 From: Ori Perry Date: Fri, 20 Mar 2026 22:02:36 +0200 Subject: [PATCH 03/12] Auto install treesitter parsers when opening a file closes #1951 --- init.lua | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 239dbad6..cacc5b7b 100644 --- a/init.lua +++ b/init.lua @@ -903,7 +903,18 @@ require('lazy').setup({ local language = vim.treesitter.language.get_lang(filetype) if not language then return end - treesitter_try_attach(buf, language) + local installed_parsers = require('nvim-treesitter').get_installed 'parsers' + + if vim.tbl_contains(installed_parsers, language) then + -- enable the parser if it is installed + treesitter_try_attach(buf, language) + elseif vim.tbl_contains(available_parsers, language) then + -- if a parser is available in `nvim-treesitter` auto install it, and enable it after the installation is done + require('nvim-treesitter').install(language):await(function() treesitter_try_attach(buf, language) end) + else + -- try to enable treesitter features in case the parser exists but is not available from `nvim-treesitter` + treesitter_try_attach(buf, language) + end end, }) end, From d3168308d47e60d772f592ccc132f27c72437cd3 Mon Sep 17 00:00:00 2001 From: Ori Perry Date: Tue, 31 Mar 2026 23:41:27 +0300 Subject: [PATCH 04/12] Update the recommanded gitsigns keybinds closes #1459 --- lua/kickstart/plugins/gitsigns.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua index 5f5652f9..1d8c50c3 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/kickstart/plugins/gitsigns.lua @@ -44,15 +44,20 @@ return { map('n', 'hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) map('n', 'hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) map('n', 'hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) - map('n', 'hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' }) map('n', 'hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) map('n', 'hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) - map('n', 'hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) + map('n', 'hi', gitsigns.preview_hunk_inline, { desc = 'git preview hunk [i]nline' }) + map('n', 'hb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' }) map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) map('n', 'hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' }) + map('n', 'hQ', function() gitsigns.setqflist 'all' end) + map('n', 'hq', gitsigns.setqflist) -- Toggles map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' }) + map('n', 'tw', gitsigns.toggle_word_diff) + + -- Text object + map({ 'o', 'x' }, 'ih', gitsigns.select_hunk) end, }, } From 16dd8f50078701fce4e2387c437b80d219b554e0 Mon Sep 17 00:00:00 2001 From: Ori Perry Date: Tue, 31 Mar 2026 23:49:19 +0300 Subject: [PATCH 05/12] Add a comment to the line plugin about installing markdownlint --- lua/kickstart/plugins/lint.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/kickstart/plugins/lint.lua b/lua/kickstart/plugins/lint.lua index 326fc3f6..556f3178 100644 --- a/lua/kickstart/plugins/lint.lua +++ b/lua/kickstart/plugins/lint.lua @@ -8,7 +8,7 @@ return { config = function() local lint = require 'lint' lint.linters_by_ft = { - markdown = { 'markdownlint' }, + markdown = { 'markdownlint' }, -- Make sure to install `markdownlint` via mason / npm } -- To allow other plugins to add linters to require('lint').linters_by_ft, From c7f05a0f47e669148b9b97d18afafead1c767a3b Mon Sep 17 00:00:00 2001 From: Sebastian Studniczek Date: Fri, 10 Apr 2026 20:05:50 +0200 Subject: [PATCH 06/12] Add indentation fallback --- init.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index cacc5b7b..9f008fa5 100644 --- a/init.lua +++ b/init.lua @@ -891,8 +891,12 @@ require('lazy').setup({ -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()' -- vim.wo.foldmethod = 'expr' + -- check if treesitter indentation is available for this language, and if so enable it + -- in case there is no indent query, the indentexpr will fallback to the vim's built in one + local has_indent_query = vim.treesitter.query.get(language, 'indent') ~= nil + -- enables treesitter based indentation - vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" + if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end end local available_parsers = require('nvim-treesitter').get_available() From f27810d1bd48d7b4cfb319a9ff290f5b09200a78 Mon Sep 17 00:00:00 2001 From: orip Date: Wed, 15 Apr 2026 03:44:13 +0300 Subject: [PATCH 07/12] Fix treesitter indents Thanks @jackHerby for the report fixes #1995 --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 9f008fa5..b56ce298 100644 --- a/init.lua +++ b/init.lua @@ -893,7 +893,7 @@ require('lazy').setup({ -- check if treesitter indentation is available for this language, and if so enable it -- in case there is no indent query, the indentexpr will fallback to the vim's built in one - local has_indent_query = vim.treesitter.query.get(language, 'indent') ~= nil + local has_indent_query = vim.treesitter.query.get(language, 'indents') ~= nil -- enables treesitter based indentation if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end From 648471c9eb1f757729e800ff0a6509e01232a8e9 Mon Sep 17 00:00:00 2001 From: Stattek <107233826+Stattek@users.noreply.github.com> Date: Wed, 15 Apr 2026 03:49:09 -0500 Subject: [PATCH 08/12] Fix descriptions of gitsigns keymappings (#1997) * Fix descriptions of keymappings * Fix capitalization --- lua/kickstart/plugins/gitsigns.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/kickstart/plugins/gitsigns.lua b/lua/kickstart/plugins/gitsigns.lua index 1d8c50c3..500ea6c4 100644 --- a/lua/kickstart/plugins/gitsigns.lua +++ b/lua/kickstart/plugins/gitsigns.lua @@ -50,11 +50,11 @@ return { map('n', 'hb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' }) map('n', 'hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) map('n', 'hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' }) - map('n', 'hQ', function() gitsigns.setqflist 'all' end) - map('n', 'hq', gitsigns.setqflist) + map('n', 'hQ', function() gitsigns.setqflist 'all' end, { desc = 'git hunk [Q]uickfix list (all files in repo)' }) + map('n', 'hq', gitsigns.setqflist, { desc = 'git hunk [q]uickfix list (all changes in this file)' }) -- Toggles map('n', 'tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) - map('n', 'tw', gitsigns.toggle_word_diff) + map('n', 'tw', gitsigns.toggle_word_diff, { desc = '[T]oggle git intra-line [w]ord diff' }) -- Text object map({ 'o', 'x' }, 'ih', gitsigns.select_hunk) From 459b86865e9e81235c9db3be553d107adac5f72f Mon Sep 17 00:00:00 2001 From: orip Date: Sun, 12 Apr 2026 19:38:37 +0300 Subject: [PATCH 09/12] Use stylua as an lsp formatter instead of an external formatter --- init.lua | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index b56ce298..dea2fccf 100644 --- a/init.lua +++ b/init.lua @@ -616,6 +616,8 @@ require('lazy').setup({ -- Special Lua Config, as recommended by neovim help docs lua_ls = { on_init = function(client) + client.server_capabilities.documentFormattingProvider = false -- Disable formatting (formatting is done by stylua) + if client.workspace_folders then local path = client.workspace_folders[1].name if path ~= vim.fn.stdpath 'config' and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) then return end @@ -637,8 +639,11 @@ require('lazy').setup({ }, }) end, + ---@type lspconfig.settings.lua_ls settings = { - Lua = {}, + Lua = { + format = { enable = false }, -- Disable formatting (formatting is done by stylua) + }, }, }, } @@ -671,7 +676,7 @@ require('lazy').setup({ keys = { { 'f', - function() require('conform').format { async = true, lsp_format = 'fallback' } end, + function() require('conform').format { async = true } end, mode = '', desc = '[F]ormat buffer', }, @@ -688,14 +693,15 @@ require('lazy').setup({ if disable_filetypes[vim.bo[bufnr].filetype] then return nil else - return { - timeout_ms = 500, - lsp_format = 'fallback', - } + return { timeout_ms = 500 } end end, + default_format_opts = { + lsp_format = 'fallback', -- Use external formatters if configured below, otherwise use LSP formatting. Set to `false` to disable LSP formatting entirely. + }, + -- You can also specify external formatters in here. formatters_by_ft = { - lua = { 'stylua' }, + -- rust = { 'rustfmt' }, -- Conform can also run multiple formatters sequentially -- python = { "isort", "black" }, -- From ce353a9b0e3c47d27784509217200818f522329e Mon Sep 17 00:00:00 2001 From: orip Date: Sun, 12 Apr 2026 22:33:59 +0300 Subject: [PATCH 10/12] Change format_on_save to a whitelist instead of a blacklist --- init.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index dea2fccf..600258db 100644 --- a/init.lua +++ b/init.lua @@ -686,14 +686,15 @@ require('lazy').setup({ opts = { notify_on_error = false, format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - if disable_filetypes[vim.bo[bufnr].filetype] then - return nil - else + -- You can specify filetypes to autoformat on save here: + local enabled_filetypes = { + -- lua = true, + -- python = true, + } + if enabled_filetypes[vim.bo[bufnr].filetype] then return { timeout_ms = 500 } + else + return nil end end, default_format_opts = { From 9b4fbc5021551188965d7cba54874fd1496d6ed2 Mon Sep 17 00:00:00 2001 From: orip Date: Sat, 18 Apr 2026 13:19:06 +0300 Subject: [PATCH 11/12] Fix conflicts between built-in incremental selection and mini.ai keymaps closes #1996 closes #1992 --- init.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 600258db..13727202 100644 --- a/init.lua +++ b/init.lua @@ -845,9 +845,16 @@ require('lazy').setup({ -- -- Examples: -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [Q]uote + -- - yinq - [Y]ank [I]nside [I]next [Q]uote -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } + require('mini.ai').setup { + -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`) + mappings = { + around_next = 'aa', + inside_next = 'ii', + }, + n_lines = 500, + } -- Add/delete/replace surroundings (brackets, quotes, etc.) -- From 4b065ad2f71935b8b053d26a65735f40bdc85969 Mon Sep 17 00:00:00 2001 From: orip Date: Wed, 22 Apr 2026 17:59:57 +0300 Subject: [PATCH 12/12] Fix mini.ai example --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 13727202..8d1f19a1 100644 --- a/init.lua +++ b/init.lua @@ -845,7 +845,7 @@ require('lazy').setup({ -- -- Examples: -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [I]next [Q]uote + -- - yiiq - [Y]ank [I]nside [I]+1 [Q]uote -- - ci' - [C]hange [I]nside [']quote require('mini.ai').setup { -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`)