feat: nvim-treesitter

nix/neovim-overlay.nix

@@ -55,6 +55,39 @@ with final.pkgs.lib; let
     flash-nvim
     which-key-nvim
     gitsigns-nvim
+
+    # Treesitter
+    (nvim-treesitter.withPlugins (
+      plugins:
+        with plugins; [
+          bash
+          diff
+          html
+          gitignore
+          javascript
+          jsdoc
+          json
+          jsonc
+          just
+          lua
+          luadoc
+          markdown
+          markdown_inline
+          nix
+          just
+          printf
+          python
+          query
+          regex
+          toml
+          tsx
+          typescript
+          vim
+          vimdoc
+          xml
+          yaml
+        ]
+    ))
   ];
 
   extraPackages = with pkgs; [

nvim/lua/plugins/editor/gitsigns-nvim.lua

@@ -27,102 +27,105 @@ return {
         local icons = require('icons')
         local mkKey = MarleyVim.wkSpec(require('colors').git)
         require('which-key').add({
-          mkKey(']h', function()
-            if vim.wo.diff then
-              vim.cmd.normal({ ']c', bang = true })
-            else
-              gitsigns.nav_hunk('next')
-            end
-          end, icons.next, { desc = 'next hunk' }),
+          {
+            buffer = buf,
+            mkKey(']h', function()
+              if vim.wo.diff then
+                vim.cmd.normal({ ']c', bang = true })
+              else
+                gitsigns.nav_hunk('next')
+              end
+            end, icons.next, { desc = 'next hunk' }),
 
-          mkKey('[h', function()
-            if vim.wo.diff then
-              vim.cmd.normal({ '[c', bang = true })
-            else
-              gitsigns.nav_hunk('prev')
-            end
-          end, icons.prev, { desc = 'previous hunk' }),
+            mkKey('[h', function()
+              if vim.wo.diff then
+                vim.cmd.normal({ '[c', bang = true })
+              else
+                gitsigns.nav_hunk('prev')
+              end
+            end, icons.prev, { desc = 'previous hunk' }),
 
-          mkKey(']H', function()
-            gitsigns.nav_hunk('last')
-          end, icons.last, { desc = 'last hunk' }),
+            mkKey(']H', function()
+              gitsigns.nav_hunk('last')
+            end, icons.last, { desc = 'last hunk' }),
 
-          mkKey('[H', function()
-            gitsigns.nav_hunk('first')
-          end, icons.first, { desc = 'first hunk' }),
+            mkKey('[H', function()
+              gitsigns.nav_hunk('first')
+            end, icons.first, { desc = 'first hunk' }),
 
-          mkKey(
-            '<LEADER>ghs',
-            '<CMD>Gitsigns stage_hunk<CR>',
-            icons.git.staged,
-            { mode = { 'n', 'v' }, desc = 'stage hunk' }
-          ),
+            mkKey(
+              '<LEADER>ghs',
+              '<CMD>Gitsigns stage_hunk<CR>',
+              icons.git.staged,
+              { mode = { 'n', 'v' }, desc = 'stage hunk' }
+            ),
 
-          mkKey(
-            '<LEADER>ghr',
-            '<CMD>Gitsigns reset_hunk<CR>',
-            icons.git.unstaged,
-            { mode = { 'n', 'v' }, desc = 'reset hunk' }
-          ),
+            mkKey(
+              '<LEADER>ghr',
+              '<CMD>Gitsigns reset_hunk<CR>',
+              icons.git.unstaged,
+              { mode = { 'n', 'v' }, desc = 'reset hunk' }
+            ),
 
-          mkKey(
-            '<LEADER>ghS',
-            gitsigns.stage_buffer,
-            icons.git.staged,
-            { desc = 'stage buffer' }
-          ),
+            mkKey(
+              '<LEADER>ghS',
+              gitsigns.stage_buffer,
+              icons.git.staged,
+              { desc = 'stage buffer' }
+            ),
 
-          mkKey(
-            '<LEADER>ghu',
-            gitsigns.undo_stage_hunk,
-            icons.undo,
-            { desc = 'undo stage hunk' }
-          ),
+            mkKey(
+              '<LEADER>ghu',
+              gitsigns.undo_stage_hunk,
+              icons.undo,
+              { desc = 'undo stage hunk' }
+            ),
 
-          mkKey(
-            '<LEADER>ghR',
-            gitsigns.reset_buffer,
-            icons.git.unstaged,
-            { desc = 'reset buffer' }
-          ),
+            mkKey(
+              '<LEADER>ghR',
+              gitsigns.reset_buffer,
+              icons.git.unstaged,
+              { desc = 'reset buffer' }
+            ),
 
-          mkKey(
-            '<LEADER>ghp',
-            gitsigns.preview_hunk_inline,
-            '',
-            { desc = 'preview hunk inline' }
-          ),
+            mkKey(
+              '<LEADER>ghp',
+              gitsigns.preview_hunk_inline,
+              '',
+              { desc = 'preview hunk inline' }
+            ),
 
-          mkKey('<LEADER>ghb', function()
-            gitsigns.blame_line({ full = true })
-          end, { cat = 'filetype', name = 'git' }, {
-            desc = 'blame line',
-          }),
+            mkKey('<LEADER>ghb', function()
+              gitsigns.blame_line({ full = true })
+            end, { cat = 'filetype', name = 'git' }, {
+              desc = 'blame line',
+            }),
 
-          mkKey(
-            '<LEADER>ghB',
-            gitsigns.blame,
-            { cat = 'filetype', name = 'git' },
-            { desc = 'blame buffer' }
-          ),
+            mkKey(
+              '<LEADER>ghB',
+              gitsigns.blame,
+              { cat = 'filetype', name = 'git' },
+              { desc = 'blame buffer' }
+            ),
 
-          mkKey(
-            '<LEADER>ghd',
-            gitsigns.diffthis,
-            icons.git.diff,
-            { desc = 'diff file' }
-          ),
+            mkKey(
+              '<LEADER>ghd',
+              gitsigns.diffthis,
+              icons.git.diff,
+              { desc = 'diff file' }
+            ),
 
-          mkKey('<LEADER>ghD', function()
-            gitsigns.diffthis('~')
-          end, icons.git.diff, { desc = 'diff file from ~' }),
+            mkKey('<LEADER>ghD', function()
+              gitsigns.diffthis('~')
+            end, icons.git.diff, { desc = 'diff file from ~' }),
 
-          mkKey(
-            'ih',
-            '<CMD><C-u>Gitsigns select_hunk<CR>',
-            '󰿚',
-            { mode = { 'o', 'x' }, desc = 'select hunk' }
-          ),
+            mkKey(
+              'ih',
+              '<CMD><C-u>Gitsigns select_hunk<CR>',
+              '󰿚',
+              { mode = { 'o', 'x' }, desc = 'select hunk' }
+            ),
+          },
         })
       end,
     })

nvim/lua/plugins/treesitter/init.lua

@@ -0,0 +1,5 @@
+local req = MarleyVim.local_require('plugins.treesitter')
+
+return {
+  req('nvim-treesitter'),
+}

nvim/lua/plugins/treesitter/nvim-treesitter.lua

@@ -0,0 +1,55 @@
+return {
+  event = { 'BufReadPost', 'BufWritePost', 'BufNewFile', 'DeferredUIEnter' },
+  keys = {
+    { '<C-space>', desc = 'increment selection' },
+    { '<BS>', desc = 'decrement selection', mode = 'x' },
+  },
+  before = function()
+    require('lz.n').trigger_load('which-key.nvim')
+  end,
+  after = function()
+    require('nvim-treesitter.configs').setup({
+      highlight = { enable = true },
+      indent = { enable = true },
+      incremental_selection = {
+        enable = true,
+        keymaps = {
+          init_selection = '<C-space>',
+          node_incremental = '<C-space>',
+          scope_incremental = false,
+          node_decremental = '<BS>',
+        },
+      },
+      textobjects = {
+        move = {
+          enable = true,
+          goto_next_start = {
+            [']f'] = '@function.outer',
+            [']c'] = '@class.outer',
+            [']a'] = '@parameter.inner',
+          },
+          goto_next_end = {
+            [']F'] = '@function.outer',
+            [']C'] = '@class.outer',
+            [']A'] = '@parameter.inner',
+          },
+          goto_previous_tart = {
+            ['[f'] = '@function.outer',
+            ['[c'] = '@class.outer',
+            ['[a'] = '@parameter.inner',
+          },
+          goto_previous_end = {
+            ['[F'] = '@function.outer',
+            ['[C'] = '@class.outer',
+            ['[A'] = '@parameter.inner',
+          },
+        },
+      },
+    })
+
+    require('which-key').add({
+      { '<BS>', desc = 'decrement selection', mode = 'x' },
+      { '<C-space>', desc = 'increment selection', mode = { 'x', 'n' } },
+    })
+  end,
+}