From bbc99da250d715f60f6df3cc19a28e514acb7a73 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Tue, 6 Jan 2026 15:13:11 +0300
Subject: [PATCH] treewide: revert back to builtGrammars from grammarPlugins

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I5c24036a40ec6f2cc8bd85a1cc8e2db06a6a6964
---
 lib/types/languages.nix                   | 2 +-
 modules/plugins/languages/python.nix      | 2 +-
 modules/plugins/languages/sql.nix         | 2 +-
 modules/plugins/treesitter/treesitter.nix | 6 +++---
 modules/plugins/ui/noice/config.nix       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/types/languages.nix b/lib/types/languages.nix
index 45515f55..b1865c41 100644
--- a/lib/types/languages.nix
+++ b/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;
diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index 9cfb82f6..b1cbe224 100644
--- a/modules/plugins/languages/python.nix
+++ b/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;
       };
     };
 
diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix
index e5787e43..e3e686ec 100644
--- a/modules/plugins/languages/sql.nix
+++ b/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";
       };
     };
diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index cf1c5375..d761d6b3 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/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`
diff --git a/modules/plugins/ui/noice/config.nix b/modules/plugins/ui/noice/config.nix
index 1f81f4a9..fe82f588 100644
--- a/modules/plugins/ui/noice/config.nix
+++ b/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 = {