overlays: remove 'nvim-treesitter-legacy-shim'

With the migration complete, I do not need it anymore.

This reverts commit bf260de243.

flake.lock

@@ -53,15 +53,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -73,11 +73,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765835352,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765911976,
-        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
+        "lastModified": 1768834646,
+        "narHash": "sha256-sZq+qm+Pg1jw+hxncm5LDujLxgPcAop3G55jPSvWhfU=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
+        "rev": "2f927757d32bcd2b11e5017bdb9f11fd9719af53",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766171975,
-        "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=",
+        "lastModified": 1768836546,
+        "narHash": "sha256-nJZkTamcXXMW+SMYiGFB6lB8l0aJw0xjssfN8xYd/Fs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5",
+        "rev": "b56c5ad14fcf8b5bc887463552483bf000ca562a",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766070988,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766242030,
-        "narHash": "sha256-GdaKIZrzm4fbFf9jBVmeQFZTwYPxUlSTZrSId/JNMAU=",
+        "lastModified": 1768845197,
+        "narHash": "sha256-+vM0FM/rBH100aZwyKgvRPtIx+mPfMbEP0XYTkVZcBg=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "30006228925f07c5c2a270bb95dc8da35d9942dc",
+        "rev": "bd279a8bfc6c5963a4ca36b93370b0217ff4e600",
         "type": "github"
       },
       "original": {

modules/home/vim/default.nix

@@ -60,8 +60,8 @@ in
       nvim-lspconfig # Easy LSP configuration
       lsp-format-nvim # Simplified formatting configuration
       none-ls-nvim # LSP integration for linters and formatters
-      nvim-treesitter-legacy.withAllGrammars # Better highlighting
-      nvim-treesitter-textobjects-legacy # More textobjects
+      nvim-treesitter.withAllGrammars # Better highlighting
+      nvim-treesitter-textobjects # More textobjects
       plenary-nvim # 'null-ls', 'telescope' dependency
 
       # Completion

modules/home/vim/plugin/settings/tree-sitter.lua

@@ -1,54 +1,119 @@
-local ts_config = require("nvim-treesitter.configs")
+local treesitter = require("nvim-treesitter")
+local ts_select = require("nvim-treesitter-textobjects.select")
+local ts_move = require("nvim-treesitter-textobjects.move")
+local utils = require("ambroisie.utils")
+local wk = require("which-key")
 
-ts_config.setup({
-    highlight = {
-        enable = true,
-        -- Avoid duplicate highlighting
-        additional_vim_regex_highlighting = false,
+local function select_textobject(query)
+    return utils.partial(ts_select.select_textobject, query)
+end
+
+local function goto_next_start(query)
+    return utils.partial(ts_move.goto_next_start, query)
+end
+local function goto_next_end(query)
+    return utils.partial(ts_move.goto_next_end, query)
+end
+local function goto_previous_start(query)
+    return utils.partial(ts_move.goto_previous_start, query)
+end
+local function goto_previous_end(query)
+    return utils.partial(ts_move.goto_previous_end, query)
+end
+
+local objects = {
+    mode = { "x", "o" },
+    { "aa", select_textobject("@parameter.outer"), desc = "a parameter" },
+    { "ia", select_textobject("@parameter.inner"), desc = "inner parameter" },
+    { "ab", select_textobject("@block.outer"), desc = "a block" },
+    { "ib", select_textobject("@block.inner"), desc = "inner block" },
+    { "ac", select_textobject("@class.outer"), desc = "a class" },
+    { "ic", select_textobject("@class.inner"), desc = "inner class" },
+    { "af", select_textobject("@function.outer"), desc = "a function" },
+    { "if", select_textobject("@function.inner"), desc = "inner function" },
+    { "ak", select_textobject("@comment.outer"), desc = "a comment" },
+    { "aS", select_textobject("@statement.outer"), desc = "a statement" },
+}
+local moves = {
+    mode = { "n", "x", "o" },
+    -- Next start
+    { "]m", goto_next_start("@function.outer"), desc = "Next method start" },
+    { "]S", goto_next_start("@statement.outer"), desc = "Next statement start" },
+    { "]]", goto_next_start("@class.outer"), desc = "Next class start" },
+    -- Next end
+    { "]M", goto_next_end("@function.outer"), desc = "Next method end" },
+    { "][", goto_next_end("@class.outer"), desc = "Next class end" },
+    -- Previous start
+    { "[m", goto_previous_start("@function.outer"), desc = "Previous method start" },
+    { "[S", goto_previous_start("@statement.outer"), desc = "Previous statement start" },
+    { "[[", goto_previous_start("@class.outer"), desc = "Previous class start" },
+    -- Previous end
+    { "[M", goto_previous_end("@function.outer"), desc = "Previous method end" },
+    { "[]", goto_previous_end("@class.outer"), desc = "Previous class end" },
+}
+
+require("nvim-treesitter-textobjects").setup({
+    select = {
+        -- Jump to matching text objects
+        lookahead = true,
     },
-    indent = {
-        enable = true,
-    },
-    textobjects = {
-        select = {
-            enable = true,
-            -- Jump to matching text objects
-            lookahead = true,
-            keymaps = {
-                ["aa"] = { query = "@parameter.outer", desc = "a parameter" },
-                ["ia"] = { query = "@parameter.inner", desc = "inner parameter" },
-                ["ab"] = { query = "@block.outer", desc = "a block" },
-                ["ib"] = { query = "@block.inner", desc = "inner block" },
-                ["ac"] = { query = "@class.outer", desc = "a class" },
-                ["ic"] = { query = "@class.inner", desc = "inner class" },
-                ["af"] = { query = "@function.outer", desc = "a function" },
-                ["if"] = { query = "@function.inner", desc = "inner function" },
-                ["ak"] = { query = "@comment.outer", desc = "a comment" },
-                ["aS"] = { query = "@statement.outer", desc = "a statement" },
-            },
-        },
-        move = {
-            enable = true,
-            -- Add to jump list
-            set_jumps = true,
-            goto_next_start = {
-                ["]m"] = { query = "@function.outer", desc = "Next method start" },
-                ["]S"] = { query = "@statement.outer", desc = "Next statement start" },
-                ["]]"] = { query = "@class.outer", desc = "Next class start" },
-            },
-            goto_next_end = {
-                ["]M"] = { query = "@function.outer", desc = "Next method end" },
-                ["]["] = { query = "@class.outer", desc = "Next class end" },
-            },
-            goto_previous_start = {
-                ["[m"] = { query = "@function.outer", desc = "Previous method start" },
-                ["[S"] = { query = "@statement.outer", desc = "Previous statement start" },
-                ["[["] = { query = "@class.outer", desc = "Previous class start" },
-            },
-            goto_previous_end = {
-                ["[M"] = { query = "@function.outer", desc = "Previous method end" },
-                ["[]"] = { query = "@class.outer", desc = "Previous class end" },
-            },
-        },
+    move = {
+        -- Add to jump list
+        set_jumps = true,
     },
 })
+
+-- Automatically setup treesitter for supported filetypes
+local function treesitter_try_attach(buf, language)
+    -- Try to load language
+    -- NOTE: the best way I found to check if a filetype has a grammar
+    if not vim.treesitter.language.add(language) then
+        return false
+    end
+
+    -- Syntax highlighting
+    vim.treesitter.start(buf, language)
+    -- Indentation
+    vim.bo.indentexpr = "v:lua.require('nvim-treesitter').indentexpr()"
+
+    return true
+end
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "*",
+    group = vim.api.nvim_create_augroup("treesitter_attach", { clear = true }),
+    callback = function(args)
+        local buf, filetype = args.buf, args.match
+        local language = vim.treesitter.language.get_lang(filetype)
+        if not language then
+            return
+        end
+        treesitter_try_attach(buf, language)
+    end,
+})
+
+-- FIXME: is this more correct?
+--[[
+local installable_parsers = require("nvim-treesitter").get_available()
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "*",
+    group = vim.api.nvim_create_augroup("treesitter_attach", { clear = true }),
+    callback = function(args)
+        local buf, filetype = args.buf, args.match
+        local language = vim.treesitter.language.get_lang(filetype)
+        if not language then
+            return
+        end
+
+        if not treesitter_try_attach(buf, language) then
+            if vim.tbl_contains(installable_parsers, language) then
+                -- Not already installed, so try to install them via nvim-treesitter if possible
+                require("nvim-treesitter").install(language):await(function()
+                    treesitter_try_attach(buf, language)
+                end)
+            end
+        end
+    end,
+})
+--]]

overlays/nvim-treesitter-legacy-shim/default.nix

@@ -1,18 +0,0 @@
-final: prev:
-let
-  inherit (final) lib;
-  overrides = final: prev:
-    let
-      hasLegacyPackage = prev ? nvim-treesitter-legacy;
-    in
-    {
-      nvim-treesitter-textobjects-legacy = prev.nvim-treesitter-textobjects.overrideAttrs {
-        dependencies = [ final.nvim-treesitter-legacy ];
-      };
-    } // (lib.optionalAttrs (!hasLegacyPackage) {
-      nvim-treesitter-legacy = final.nvim-treesitter;
-    });
-in
-{
-  vimPlugins = prev.vimPlugins.extend (overrides);
-}