diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix
index e7cf26d7..809794e9 100644
--- a/modules/plugins/languages/python.nix
+++ b/modules/plugins/languages/python.nix
@@ -12,7 +12,7 @@
   inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.generators) mkLuaInline;
   inherit (lib.nvim.dag) entryBefore;
-  inherit (lib.nvim.types) mkServersOption;
+  inherit (lib.nvim.types) mkGrammarOption mkServersOption;
 
   cfg = config.vim.languages.python;
 
@@ -219,11 +219,7 @@ in {
 
     treesitter = {
       enable = mkEnableOption "Python treesitter" // {default = config.vim.languages.enableTreesitter;};
-      package = mkOption {
-        description = "Python treesitter grammar to use";
-        type = package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.python;
-      };
+      package = mkGrammarOption pkgs "python";
     };
 
     lsp = {
diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix
index ad254c27..f108a894 100644
--- a/modules/plugins/languages/sql.nix
+++ b/modules/plugins/languages/sql.nix
@@ -9,7 +9,7 @@
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.types) enum listOf package str;
-  inherit (lib.nvim.types) diagnostics mkServersOption;
+  inherit (lib.nvim.types) diagnostics mkGrammarOption mkServersOption;
   inherit (lib.nvim.attrsets) mapListToAttrs;
   inherit (lib.generators) mkLuaInline;
 
@@ -66,12 +66,7 @@ in {
 
     treesitter = {
       enable = mkEnableOption "SQL treesitter" // {default = config.vim.languages.enableTreesitter;};
-
-      package = mkOption {
-        type = package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
-        description = "SQL treesitter grammar to use";
-      };
+      package = mkGrammarOption pkgs "sql";
     };
 
     lsp = {
diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix
index d56b3176..2ed2b59f 100644
--- a/modules/plugins/languages/yaml.nix
+++ b/modules/plugins/languages/yaml.nix
@@ -49,7 +49,6 @@ in {
 
     treesitter = {
       enable = mkEnableOption "YAML treesitter" // {default = config.vim.languages.enableTreesitter;};
-
       package = mkGrammarOption pkgs "yaml";
     };