mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wrappers: define pkgs default within type declaration

Browse source 
This fixes #2378
This commit is contained in:
Matt Sturgeon 2024-10-11 00:27:45 +01:00
parent e1c0b52487
commit 5cd8c9cf31
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
wrappers/_shared.nix
View file

@ -28,7 +28,19 @@ let
setAttrByPath setAttrByPath
; ;
cfg = config.programs.nixvim; cfg = config.programs.nixvim;
nixvimConfiguration = config.lib.nixvim.modules.evalNixvim evalArgs; nixvimConfiguration = config.lib.nixvim.modules.evalNixvim (
evalArgs
// {
modules = evalArgs.modules or [ ] ++ [
# Use global packages by default in nixvim's submodule
# TODO: `useGlobalPackages` option and/or deprecate using host packages?
{
_file = ./_shared.nix;
nixpkgs.pkgs = lib.mkDefault pkgs;
}
];
}
);
extraFiles = lib.filter (file: file.enable) (lib.attrValues cfg.extraFiles); extraFiles = lib.filter (file: file.enable) (lib.attrValues cfg.extraFiles);
in in
{ {
@ -63,10 +75,6 @@ in
_module.args.nixvimLib = lib.mkDefault config.lib.nixvim.extendedLib; _module.args.nixvimLib = lib.mkDefault config.lib.nixvim.extendedLib;
} }
# Use global packages by default in nixvim's submodule
# TODO: `useGlobalPackages` option and/or deprecate using host packages?
{ programs.nixvim.nixpkgs.pkgs = lib.mkDefault pkgs; }
# Propagate nixvim's assertions to the host modules # Propagate nixvim's assertions to the host modules
(lib.mkIf cfg.enable { inherit (cfg) warnings assertions; }) (lib.mkIf cfg.enable { inherit (cfg) warnings assertions; })