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/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 = {