feat: use mkGrammarOption

extra.nix

@@ -115,6 +115,7 @@ inputs: let
       vim.git = {
         enable = true;
         gitsigns.enable = true;
+        gitsigns.codeActions = true;
       };
 
       vim.minimap = {

lib/types/default.nix

@@ -5,5 +5,5 @@
 in {
   inherit (typesDag) dagOf;
   inherit (typesPlugin) pluginsOpt;
-  inherit (typesLanguage) diagnostics;
+  inherit (typesLanguage) diagnostics mkGrammarOption;
 }

lib/types/languages.nix

@@ -23,4 +23,9 @@ in {
       type = with types; listOf (either (enum (attrNames diagnostics)) (submodule diagnosticSubmodule));
       default = defaultDiagnostics;
     };
+
+  mkGrammarOption = pkgs: grammar:
+    mkPackageOption pkgs ["${grammar} treesitter"] {
+      default = ["vimPlugins" "nvim-treesitter" "builtGrammars" grammar];
+    };
 }

modules/languages/clang.nix

@@ -41,16 +41,8 @@ in {
         type = types.bool;
         default = config.vim.languages.enableTreesitter;
       };
-      cPackage = mkOption {
+      cPackage = nvim.types.mkGrammarOption pkgs "c";
-        description = "C treesitter grammar to use";
+      cppPackage = nvim.types.mkGrammarOption pkgs "cpp";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.c;
-      };
-      cppPackage = mkOption {
-        description = "C++ treesitter grammar to use";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.cpp;
-      };
     };
 
     lsp = {

modules/languages/go.nix

@@ -31,11 +31,7 @@ in {
         type = types.bool;
         default = config.vim.languages.enableTreesitter;
       };
-      package = mkOption {
+      package = nvim.types.mkGrammarOption pkgs "go";
-        description = "Go treesitter grammar to use";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.go;
-      };
     };
 
     lsp = {

modules/languages/markdown/config.nix

@@ -9,6 +9,11 @@ with builtins; let
   cfg = config.vim.languages.markdown;
 in {
   config = mkIf cfg.enable (mkMerge [
+    (mkIf cfg.treesitter.enable {
+      vim.treesitter.enable = true;
+      vim.treesitter.grammars = [cfg.treesitter.package];
+    })
+
     (mkIf cfg.glow.enable {
       vim.startPlugins = ["glow-nvim"];
 

modules/languages/markdown/markdown.nix

@@ -16,5 +16,14 @@ in {
       default = true;
       description = "Enable markdown preview in neovim with glow";
     };
+
+    treesitter = {
+      enable = mkOption {
+        description = "Enable Markdown treesitter";
+        type = types.bool;
+        default = config.vim.languages.enableTreesitter;
+      };
+      package = nvim.types.mkGrammarOption pkgs "markdown";
+    };
   };
 }

modules/languages/nix.nix

@@ -92,11 +92,7 @@ in {
         type = types.bool;
         default = config.vim.languages.enableTreesitter;
       };
-      package = mkOption {
+      package = nvim.types.mkGrammarOption pkgs "nix";
-        description = "Nix treesitter grammar to use";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.nix;
-      };
     };
 
     lsp = {

modules/languages/python.nix

@@ -64,11 +64,7 @@ in {
         type = with types; enum (attrNames servers);
         default = defaultServer;
       };
-      package = mkOption {
+      package = nvim.types.mkGrammarOption pkgs "python";
-        description = "Python LSP server package";
-        type = types.package;
-        default = servers.${cfg.lsp.server}.package;
-      };
     };
 
     format = {

modules/languages/rust.nix

@@ -17,11 +17,7 @@ in {
         type = types.bool;
         default = config.vim.languages.enableTreesitter;
       };
-      package = mkOption {
+      package = nvim.types.mkGrammarOption pkgs "rust";
-        description = "Rust treesitter grammar to use";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.rust;
-      };
     };
 
     crates = {

modules/languages/ts.nix

@@ -63,16 +63,8 @@ in {
         type = types.bool;
         default = config.vim.languages.enableTreesitter;
       };
-      tsPackage = mkOption {
+      tsPackage = nvim.types.mkGrammarOption pkgs "tsx";
-        description = "Typescript treesitter grammar to use";
+      jsPackage = nvim.types.mkGrammarOption pkgs "javascript";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.tsx;
-      };
-      jsPackage = mkOption {
-        description = "Javascript treesitter grammar to use";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.javascript;
-      };
     };
 
     lsp = {

modules/languages/zig.nix

@@ -17,11 +17,7 @@ in {
         type = types.bool;
         default = config.vim.languages.enableTreesitter;
       };
-      package = mkOption {
+      package = nvim.types.mkGrammarOption pkgs "zig";
-        description = "Zig treesitter grammar to use";
-        type = types.package;
-        default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.zig;
-      };
     };
     lsp = {
       enable = mkOption {