Merge 8692d195c4 into c1713898c4

lib/types/languages.nix

@@ -30,7 +30,7 @@
 
   mkGrammarOption = pkgs: grammar:
     mkPackageOption pkgs ["${grammar} treesitter"] {
-      default = ["vimPlugins" "nvim-treesitter" "grammarPlugins" grammar];
+      default = ["vimPlugins" "nvim-treesitter" "builtGrammars" grammar];
     };
 in {
   inherit diagnostics diagnosticSubmodule mkGrammarOption;

modules/plugins/languages/python.nix

@@ -228,7 +228,7 @@ in {
       package = mkOption {
         description = "Python treesitter grammar to use";
         type = package;
-        default = pkgs.vimPlugins.nvim-treesitter.grammarPlugins.python;
+        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.python;
       };
     };
 

modules/plugins/languages/sql.nix

@@ -66,7 +66,7 @@ in {
 
       package = mkOption {
         type = package;
-        default = pkgs.vimPlugins.nvim-treesitter.grammarPlugins.sql;
+        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
         description = "SQL treesitter grammar to use";
       };
     };

modules/plugins/treesitter/config.nix

@@ -39,7 +39,8 @@ in {
         ];
       };
 
-      # For some reason treesitter highlighting does not work on start if this is set before syntax on
+      # For some reason treesitter highlighting does not work on start if this
+      # is set before 'syntax on' or similar.
       pluginRC.treesitter-fold = mkIf cfg.fold (entryBefore ["basic"] ''
         -- This is required by treesitter-context to handle folds
         vim.o.foldmethod = "expr"
@@ -54,8 +55,8 @@ in {
       pluginRC.treesitter = entryAfter ["basic"] ''
         require('nvim-treesitter.config').setup {
           -- Disable imperative treesitter options that would attempt to fetch
-          -- grammars into the read-only Nix store. To add additional grammars here
-          -- you must use the `config.vim.treesitter.grammars` option.
+          -- grammars into the read-only Nix store. To add additional grammars
+          -- here, you must use the `config.vim.treesitter.grammars` option.
           auto_install = false,
           sync_install = false,
           ensure_installed = {},
@@ -74,9 +75,8 @@ in {
           },
 
           -- Indentation module for Treesitter
-          -- Keymaps are set to false here as they are
-          -- handled by `vim.maps` entries calling lua
-          -- functions achieving the same functionality.
+          -- Keymaps are set to false here as they are handled by `vim.maps`
+          -- entries calling Lua functions achieving the same functionality.
           incremental_selection = {
             enable = ${toLuaObject cfg.incrementalSelection.enable},
             disable = ${toLuaObject cfg.incrementalSelection.disable},
@@ -85,7 +85,6 @@ in {
               node_incremental = false,
               scope_incremental = false,
               node_decremental = false,
-
             },
           },
         }

modules/plugins/treesitter/treesitter.nix

@@ -25,14 +25,14 @@ in {
       type = listOf package;
       default = [];
       example = literalExpression ''
-        with pkgs.vimPlugins.nvim-treesitter.grammarPlugins; [
+        with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
           regex
           kdl
         ];
       '';
       description = ''
         List of treesitter grammars to install. For grammars to be installed properly,
-        you must use grammars from `pkgs.vimPlugins.nvim-treesitter.grammarPlugins`.
+        you must use grammars from `pkgs.vimPlugins.nvim-treesitter.builtGrammars`.
         You can use `pkgs.vimPlugins.nvim-treesitter.allGrammars` to install all grammars.
 
         For languages already supported by nvf, you may use
@@ -56,7 +56,7 @@ in {
       internal = true;
       readOnly = true;
       type = listOf package;
-      default = with pkgs.vimPlugins.nvim-treesitter.grammarPlugins; [c lua vim vimdoc query];
+      default = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [c lua vim vimdoc query];
       description = ''
         A list of treesitter grammars that will be installed by default
         if treesitter has been enabled and  {option}`vim.treeesitter.addDefaultGrammars`

modules/plugins/ui/noice/config.nix

@@ -12,7 +12,7 @@
   cfg = config.vim.ui.noice;
   tscfg = config.vim.treesitter;
 
-  defaultGrammars = with pkgs.vimPlugins.nvim-treesitter.grammarPlugins; [vim regex lua bash markdown];
+  defaultGrammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [vim regex lua bash markdown];
 in {
   config = mkIf cfg.enable {
     vim = {

modules/wrapper/build/config.nix

@@ -35,7 +35,11 @@
     );
 
   # Build a given Treesitter grammar.
-  buildTreesitterPlug = grammars: vimPlugins.nvim-treesitter.withPlugins (_: grammars);
+  buildTreesitterPlug = grammars:
+    vimPlugins.nvim-treesitter.withPlugins (_: grammars)
+    // {
+      installQueries = true;
+    };
 
   pluginBuilders = {
     nvim-treesitter = buildTreesitterPlug config.vim.treesitter.grammars;

npins/sources.json

@@ -2062,11 +2062,11 @@
         "owner": "nvim-treesitter",
         "repo": "nvim-treesitter-textobjects"
       },
-      "branch": "master",
+      "branch": "main",
       "submodules": false,
-      "revision": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c",
-      "url": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/archive/71385f191ec06ffc60e80e6b0c9a9d5daed4824c.tar.gz",
-      "hash": "0pp8s0wljwhc93jp47ad4pigqm8q7v173374c1vpydhx09qwl4ga"
+      "revision": "28a3494c075ef0f353314f627546537e43c09592",
+      "url": "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/archive/28a3494c075ef0f353314f627546537e43c09592.tar.gz",
+      "hash": "1ky29nw4ayzpvbh4y0jp7apdfwj6pd8wvnx5gsw2z6rxdl0qhmz5"
     },
     "nvim-ts-autotag": {
       "type": "Git",