Merge pull request #915 from Soliprem/neorg-fix

languagaes/neorg: fix grammar packages

docs/release-notes/rl-0.8.md

@@ -463,3 +463,6 @@
   leverage the pattern introduced in commit [fc8206e7a61d ("flake: utilize
   nix-systems for overridable flake systems")](
   https://github.com/NotAShelf/nvf/commit/fc8206e7a61d7eb02006f9010e62ebdb3336d0d2).
+
+[soliprem](https://github.com/soliprem):
+- fix broken `neorg` grammars

modules/plugins/notes/neorg/config.nix

@@ -35,7 +35,7 @@ in {
 
     (mkIf cfg.treesitter.enable {
       vim.treesitter.enable = true;
-      vim.treesitter.grammars = [cfg.treesitter.norgPackage];
+      vim.treesitter.grammars = [cfg.treesitter.norgPackage cfg.treesitter.norgMetaPackage];
     })
   ]);
 }

modules/plugins/notes/neorg/neorg.nix

@@ -4,9 +4,9 @@
   pkgs,
   ...
 }: let
-  inherit (lib.options) mkEnableOption mkOption;
+  inherit (lib.options) mkPackageOption mkEnableOption mkOption;
   inherit (lib.types) submodule listOf str;
-  inherit (lib.nvim.types) mkGrammarOption mkPluginSetupOption;
+  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.notes.neorg = {
     enable = mkEnableOption ''
@@ -44,7 +44,12 @@ in {
 
     treesitter = {
       enable = mkEnableOption "Neorg treesitter" // {default = config.vim.languages.enableTreesitter;};
-      norgPackage = mkGrammarOption pkgs "norg";
+      norgPackage = mkPackageOption pkgs ["norg-meta treesitter"] {
+        default = ["tree-sitter-grammars" "tree-sitter-norg"];
+      };
+      norgMetaPackage = mkPackageOption pkgs ["norg-meta treesitter"] {
+        default = ["tree-sitter-grammars" "tree-sitter-norg-meta"];
+      };
     };
   };
 }