mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-07-10 09:14:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins/neorg: use neorgTelescopePackage option

Browse source
This commit is contained in:
Austin Horstman 2024-09-14 12:16:15 -05:00
parent 7a9bb2ee95
commit e3e3774177
No known key found for this signature in database
2 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/by-name/neorg/default.nix
View file

@ -20,6 +20,11 @@ with lib;
]; ];
}; };
neorgTelescopePackage = lib.mkPackageOption pkgs [
"vimPlugins"
"neorg-telescope"
] { nullable = true; };
lazyLoading = helpers.defaultNullOpts.mkBool false ''''; lazyLoading = helpers.defaultNullOpts.mkBool false '''';
logger = logger =
@ -148,12 +153,18 @@ with lib;
Telescope support for neorg (`core.integrations.telescope`) is enabled but the Telescope support for neorg (`core.integrations.telescope`) is enabled but the
telescope plugin is not. telescope plugin is not.
'') '')
++ (optional (telescopeSupport && (cfg.neorgTelescopePackage == null)) ''
Telescope support for neorg (`core.integrations.telescope`) is enabled but the
`neorgTelescopePackage` package is not set.
'')
++ (optional ((hasAttr "core.defaults" cfg.modules) && (!config.plugins.treesitter.enable)) '' ++ (optional ((hasAttr "core.defaults" cfg.modules) && (!config.plugins.treesitter.enable)) ''
Neorg's `core.defaults` module is enabled but `plugins.treesitter` is not. Neorg's `core.defaults` module is enabled but `plugins.treesitter` is not.
Treesitter is required when using the `core.defaults`. Treesitter is required when using the `core.defaults`.
''); '');
extraPlugins = [ cfg.package ] ++ (optional telescopeSupport pkgs.vimPlugins.neorg-telescope); extraPlugins = [
cfg.package
] ++ (optional (telescopeSupport && cfg.neorgTelescopePackage != null) cfg.neorgTelescopePackage);
extraConfigLua = '' extraConfigLua = ''
require('neorg').setup(${helpers.toLuaObject setupOptions}) require('neorg').setup(${helpers.toLuaObject setupOptions})

15
tests/test-sources/plugins/by-name/neorg/default.nix
View file

@ -75,13 +75,24 @@
}; };
telescope-integration = { telescope-integration = {
# TODO: re-enable when this will have been fixed upstream.
test.runNvim = false;
plugins = { plugins = {
telescope.enable = false; telescope.enable = true;
neorg = { neorg = {
enable = false; enable = true;
modules."core.integrations.telescope".__empty = null; modules."core.integrations.telescope".__empty = null;
}; };
}; };
}; };
no-packages = {
# TODO: re-enable when this will have been fixed upstream.
test.runNvim = false;
plugins.neorg = {
enable = true;
neorgTelescopePackage = null;
};
};
} }