update tree-sitter

viperML · Aug 21, 2024 · 72c4dc7 · 72c4dc7
1 parent 91f19e0
commit 72c4dc7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -13,6 +13,7 @@
     tree-sitter = {
       url = "github:viperML/tree-sitter";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
     };
 
     nh = {

diff --git a/flake/flake.nix.hbs b/flake/flake.nix.hbs
@@ -15,6 +15,7 @@
     tree-sitter = {
       url = "github:viperML/tree-sitter";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-parts.follows = "flake-parts";
     };
 
     nh = {

diff --git a/modules/wrapper-manager/neovim/default.nix b/modules/wrapper-manager/neovim/default.nix
@@ -125,9 +125,21 @@ Many things stolen from https://github.com/Gerg-L/mnw :)
       (attrValues nvPlugins')
 
       (makeOpt inputs'.tree-sitter.packages.nvim-treesitter)
-      (lib.attrValues (builtins.removeAttrs inputs'.tree-sitter.legacyPackages.grammars.filtered [
-        "tree-sitter-comment"
-      ]))
+
+      (builtins.attrValues
+        (lib.getAttrs
+          (map (n: "tree-sitter-${n}") [
+            # grammars are slow AF, so don't pull the grammars for potentially big files like JSON
+            "scheme"
+            "nix"
+            "lua"
+            "rust"
+            "haskell"
+            "markdown"
+            "c"
+            "cpp"
+          ])
+          inputs'.tree-sitter.legacyPackages.nvim-grammars.filtered))
 
       (makeOpt pkgs.vimPlugins.parinfer-rust)
     ];