NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 02:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #915 from Soliprem/neorg-fix
Some checks are pending
Set up binary cache / cachix (default) (push) Waiting to run
Details
Set up binary cache / cachix (maximal) (push) Waiting to run
Details
Set up binary cache / cachix (nix) (push) Waiting to run
Details
Treewide Checks / Validate flake (push) Waiting to run
Details
Treewide Checks / Check formatting (push) Waiting to run
Details
Treewide Checks / Check source tree for typos (push) Waiting to run
Details
Treewide Checks / Validate documentation builds (push) Waiting to run
Details
Treewide Checks / Validate hyperlinks in documentation sources (push) Waiting to run
Details
Treewide Checks / Validate Editorconfig conformance (push) Waiting to run
Details
Build and deploy documentation / Check latest commit (push) Waiting to run
Details
Build and deploy documentation / publish (push) Blocked by required conditions
Details

Browse source 
languagaes/neorg: fix grammar packages
This commit is contained in:
raf 2025-07-16 20:37:39 +03:00 • committed by GitHub
commit fe874acd37
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/release-notes/rl-0.8.md
View file

@ -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

2
modules/plugins/notes/neorg/config.nix
View file

@ -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];
})
]);
}

11
modules/plugins/notes/neorg/neorg.nix
View file

@ -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"];
};
};
};
}