wrappers: move assertion propagation to _shared.nix

This commit is contained in:
Matt Sturgeon 2024-09-24 11:25:43 +01:00
parent 6da94195c2
commit 87509bac1f
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
4 changed files with 36 additions and 42 deletions

View file

@ -45,20 +45,17 @@ in
})
];
config = mkIf cfg.enable (mkMerge [
{
environment.systemPackages = [
cfg.finalPackage
cfg.printInitPackage
] ++ (lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs);
}
{
inherit (cfg) warnings assertions;
programs.neovim.defaultEditor = cfg.defaultEditor;
environment.variables = {
VIM = mkIf (!cfg.wrapRc) "/etc/nvim";
EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
};
}
]);
config = mkIf cfg.enable {
environment.systemPackages = [
cfg.finalPackage
cfg.printInitPackage
] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
environment.variables = {
VIM = mkIf (!cfg.wrapRc) "/etc/nvim";
EDITOR = mkIf cfg.defaultEditor (lib.mkOverride 900 "nvim");
};
programs.neovim.defaultEditor = cfg.defaultEditor;
};
}