diff --git a/lib/types/languages.nix b/lib/types/languages.nix
index b1865c41..40dfa541 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" "builtGrammars" grammar];
+      default = ["tree-sitter-grammars" grammar];
     };
 in {
   inherit diagnostics diagnosticSubmodule mkGrammarOption;
diff --git a/lib/types/plugins.nix b/lib/types/plugins.nix
index 4be39289..e72017e0 100644
--- a/lib/types/plugins.nix
+++ b/lib/types/plugins.nix
@@ -21,7 +21,7 @@
   pluginType = nullOr (
     either
     package
-    (enum (pluginInputNames ++ ["nvim-treesitter" "flutter-tools-patched" "vim-repeat"]))
+    (enum (pluginInputNames ++ ["tree-sitter-grammars" "flutter-tools-patched" "vim-repeat"]))
   );
 
   pluginsType = listOf pluginType;
diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index bec7ec8b..3adb235a 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -164,7 +164,7 @@ in {
       package = mkOption {
         description = "Python treesitter grammar to use";
         type = package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.python;
+        default = pkgs.tree-sitter-grammars.tree-sitter-python;
       };
     };
 
diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix
index add46c15..b00605bb 100644
--- a/modules/plugins/languages/sql.nix
+++ b/modules/plugins/languages/sql.nix
@@ -74,7 +74,7 @@ in {
       package = mkOption {
         description = "SQL treesitter grammar to use";
         type = package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
+        default = pkgs.tree-sitter-grammars.tree-sitter-sql;
       };
     };
 
diff --git a/modules/plugins/notes/neorg/neorg.nix b/modules/plugins/notes/neorg/neorg.nix
index 6b5cf18e..4ee92d43 100644
--- a/modules/plugins/notes/neorg/neorg.nix
+++ b/modules/plugins/notes/neorg/neorg.nix
@@ -44,7 +44,7 @@ in {
 
     treesitter = {
       enable = mkEnableOption "Neorg treesitter" // {default = config.vim.languages.enableTreesitter;};
-      norgPackage = mkGrammarOption pkgs "norg";
+      norgPackage = mkGrammarOption pkgs "tree-sitter-norg";
     };
   };
 }
diff --git a/modules/plugins/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix
index d88cc1a9..99deb969 100644
--- a/modules/plugins/treesitter/treesitter.nix
+++ b/modules/plugins/treesitter/treesitter.nix
@@ -25,14 +25,14 @@ in {
       type = listOf package;
       default = [];
       example = literalExpression ''
-        pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-          regex
-          kdl
+        pkgs.tree-sitter-grammars; [
+          tree-sitter-regex
+          tree-sitter-kdl
         ];
       '';
       description = ''
         List of treesitter grammars to install. For grammars to be installed properly,
-        you must use grammars from `pkgs.vimPlugins.nvim-treesitter.builtGrammars`.
+        you must use grammars from `pkgs.tree-sitter-grammars`.
 
         For languages already supported by nvf, you may use
         {option}`vim.language.<lang>.treesitter` options, which will automatically add
@@ -55,7 +55,7 @@ in {
       internal = true;
       readOnly = true;
       type = listOf package;
-      default = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [c lua vim vimdoc query];
+      default = with pkgs.tree-sitter-grammars; [tree-sitter-c tree-sitter-lua tree-sitter-vim];
       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 fe82f588..55bfd590 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.builtGrammars; [vim regex lua bash markdown];
+  defaultGrammars = with pkgs.tree-sitter-grammars; [tree-sitter-vim tree-sitter-regex tree-sitter-lua tree-sitter-bash tree-sitter-markdown];
 in {
   config = mkIf cfg.enable {
     vim = {