Almost rewrote my entire config

dotfiles/neovim/lua/my/plugins/treesitter.lua

@@ -1,45 +1,105 @@
-local M = {}
-
-function M.setup()
-  require'nvim-treesitter.configs'.setup {
-    ensure_installed = {
-      "bash",
-      "javascript",
-      "typescript",
-      "c",
-      "cpp",
-      "css",
-      "dockerfile",
-      "elixir",
-      "fish",
-      "html",
-      "json",
-      "jsonc",
-      "latex",
-      "python",
-      "rust",
-      "scss",
-      "toml",
-      "tsx",
-      "vim",
-      "yaml",
-      "nix",
-      "kotlin"
-    },
-    sync_install = false,
-    indent = { enable = true },
-    highlight = {
-      enable = true,
-
-      disable = { "kotlin", "tex", "latex" },
-
-      -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-      -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-      -- Using this option may slow down your editor, and you may see some duplicate highlights.
-      -- Instead of true it can also be a list of languages
-      additional_vim_regex_highlighting = false
-    }
-  }
-end
+local M = {
+  "nvim-treesitter/nvim-treesitter",
+  build = ":TSUpdate",
+  event = "BufReadPost",
+  dependencies = {
+    "nvim-treesitter/nvim-treesitter-textobjects",
+  },
+  config = function()
+    require("nvim-treesitter.configs").setup({
+      --{{{Languages
+      ensure_installed = {
+        "bash",
+        "javascript",
+        "typescript",
+        "c",
+        "cpp",
+        "css",
+        "dockerfile",
+        "elixir",
+        "fish",
+        "html",
+        "json",
+        "jsonc",
+        "latex",
+        "python",
+        "rust",
+        "scss",
+        "toml",
+        "tsx",
+        "vim",
+        "yaml",
+        "nix",
+      },
+      sync_install = false,
+      --}}}
+      --{{{ Highlighting
+      highlight = {
+        enable = true,
+        disable = { "kotlin", "tex", "latex" },
+        additional_vim_regex_highlighting = false,
+      },
+      --}}}
+      --{{{ Incremental selection
+      incremental_selection = {
+        enable = true,
+        keymaps = {
+          init_selection = "<C-space>",
+          node_incremental = "<C-space>",
+          scope_incremental = "<C-s>",
+          node_decremental = "<C-b>",
+        },
+      },
+      --}}}
+      --{{{ Textsubjects
+      textsubjects = {
+        enable = true,
+        keymaps = {
+          ["."] = "textsubjects-smart",
+          [";"] = "textsubjects-container-outer",
+        },
+      },
+      --}}}
+      textobjects = {
+        --{{{ Select
+        select = {
+          enable = false,
+          lookahead = true,
+          keymaps = {
+            -- You can use the capture groups defined in textobjects.scm
+            ["af"] = "@function.outer",
+            ["if"] = "@function.inner",
+            ["ac"] = "@class.outer",
+            ["ic"] = "@class.inner",
+          },
+        },
+        --}}}
+        --{{{ Move
+        move = {
+          enable = true,
+          set_jumps = true, -- whether to set jumps in the jumplist
+          goto_next_start = {
+            ["]f"] = "@function.outer",
+            ["]c"] = "@class.outer",
+          },
+          goto_next_end = {
+            ["]F"] = "@function.outer",
+            ["]C"] = "@class.outer",
+          },
+          goto_previous_start = {
+            ["[f"] = "@function.outer",
+            ["[c"] = "@class.outer",
+          },
+          goto_previous_end = {
+            ["[F"] = "@function.outer",
+            ["[C"] = "@class.outer",
+          },
+        },
+        --}}}
+      },
+      indent = { enable = true },
+    })
+  end,
+}
 
 return M