diff --git a/modules/plugins/notes/neorg/config.nix b/modules/plugins/notes/neorg/config.nix index fab5079d..f8c18ea9 100644 --- a/modules/plugins/notes/neorg/config.nix +++ b/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]; }) ]); } diff --git a/modules/plugins/notes/neorg/neorg.nix b/modules/plugins/notes/neorg/neorg.nix index 6b5cf18e..34b4687e 100644 --- a/modules/plugins/notes/neorg/neorg.nix +++ b/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"]; + }; }; }; }