.gitignore

@@ -5,10 +5,9 @@ nvim
 
 spell/
 
-# In your personal fork, you likely want to comment this, since it's recommended to track
+# You likely want to comment this, since it's recommended to track lazy-lock.json in version
-# lazy-lock.json in version control - see https://lazy.folke.io/usage/lockfile
+# control, see https://lazy.folke.io/usage/lockfile
-# For the official `nvim-lua/kickstart.nvim` git repository, we leave it ignored to avoid unneeded
+# For kickstart, it makes sense to leave it ignored.
-# merge conflicts.
 lazy-lock.json
 
 .DS_Store

lua/kickstart/plugins/conform.lua

@@ -8,7 +8,7 @@ return {
     keys = {
       {
         '<leader>f',
-        function() require('conform').format { async = true } end,
+        function() require('conform').format { async = true, lsp_format = 'fallback' } end,
         mode = '',
         desc = '[F]ormat buffer',
       },
@@ -18,23 +18,21 @@ return {
     opts = {
       notify_on_error = false,
       format_on_save = function(bufnr)
-        -- You can specify filetypes to autoformat on save here:
+        -- Disable "format_on_save lsp_fallback" for languages that don't
-        local enabled_filetypes = {
+        -- have a well standardized coding style. You can add additional
-          -- lua = true,
+        -- languages here or re-enable it for the disabled ones.
-          -- python = true,
+        local disable_filetypes = { c = true, cpp = true }
-        }
+        if disable_filetypes[vim.bo[bufnr].filetype] then
-        if enabled_filetypes[vim.bo[bufnr].filetype] then
-          return { timeout_ms = 500 }
-        else
           return nil
+        else
+          return {
+            timeout_ms = 500,
+            lsp_format = 'fallback',
+          }
         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 = {
-        -- rust = { 'rustfmt' },
+        lua = { 'stylua' },
         -- Conform can also run multiple formatters sequentially
         -- python = { "isort", "black" },
         --

lua/kickstart/plugins/gitsigns.lua

@@ -63,20 +63,15 @@ return {
       map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
       map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
       map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
+      map('n', '<leader>hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' })
       map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
       map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
-      map('n', '<leader>hi', gitsigns.preview_hunk_inline, { desc = 'git preview hunk [i]nline' })
+      map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
-      map('n', '<leader>hb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' })
       map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
       map('n', '<leader>hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' })
-      map('n', '<leader>hQ', function() gitsigns.setqflist 'all' end, { desc = 'git hunk [Q]uickfix list (all files in repo)' })
-      map('n', '<leader>hq', gitsigns.setqflist, { desc = 'git hunk [q]uickfix list (all changes in this file)' })
       -- Toggles
       map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
-      map('n', '<leader>tw', gitsigns.toggle_word_diff, { desc = '[T]oggle git intra-line [w]ord diff' })
+      map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
-
-      -- Text object
-      map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
     end,
   },
 }

lua/kickstart/plugins/lint.lua

@@ -8,7 +8,7 @@ return {
   config = function()
     local lint = require 'lint'
     lint.linters_by_ft = {
-      markdown = { 'markdownlint' }, -- Make sure to install `markdownlint` via mason / npm
+      markdown = { 'markdownlint' },
     }
 
     -- To allow other plugins to add linters to require('lint').linters_by_ft,

lua/kickstart/plugins/lspconfig.lua

@@ -138,8 +138,6 @@ return {
         -- 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
@@ -161,11 +159,8 @@ return {
               },
             })
           end,
-          ---@type lspconfig.settings.lua_ls
           settings = {
-            Lua = {
+            Lua = {},
-              format = { enable = false }, -- Disable formatting (formatting is done by stylua)
-            },
           },
         },
       }

lua/kickstart/plugins/mini.lua

@@ -8,16 +8,9 @@ return {
       --
       -- Examples:
       --  - va)  - [V]isually select [A]round [)]paren
-      --  - yiiq - [Y]ank [I]nside [I]+1 [Q]uote
+      --  - yinq - [Y]ank [I]nside [N]ext [Q]uote
       --  - ci'  - [C]hange [I]nside [']quote
-      require('mini.ai').setup {
+      require('mini.ai').setup { n_lines = 500 }
-        -- 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.)
       --

lua/kickstart/plugins/treesitter.lua

@@ -8,32 +8,8 @@ return {
     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'
-
-        -- 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, 'indents') ~= nil
-
-        -- enables treesitter based indentation
-        if has_indent_query then vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end
-      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
@@ -41,18 +17,18 @@ return {
           local language = vim.treesitter.language.get_lang(filetype)
           if not language then return end
 
-          local installed_parsers = require('nvim-treesitter').get_installed 'parsers'
+          -- 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)
 
-          if vim.tbl_contains(installed_parsers, language) then
+          -- enables treesitter based folds
-            -- enable the parser if it is installed
+          -- for more info on folds see `:help folds`
-            treesitter_try_attach(buf, language)
+          -- vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
-          elseif vim.tbl_contains(available_parsers, language) then
+          -- vim.wo.foldmethod = 'expr'
-            -- 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)
+          -- enables treesitter based indentation
-          else
+          vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-            -- 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,