modules/{output,files,test}: move outputs to build scope

Move the following output options into `build`:
- finalPackage -> package
- printInitPackage
- initPath -> initFile
- filesPlugin -> extraFiles
- test.derivation -> test
This commit is contained in:
Matt Sturgeon 2024-09-24 07:02:22 +01:00
parent 7bda0f1ce4
commit 692e39311e
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
14 changed files with 129 additions and 73 deletions

View file

@ -74,7 +74,7 @@ in
) extraFiles
)
// {
${filesPrefix + initName}.source = cfg.initPath;
${filesPrefix + initName}.source = cfg.build.initFile;
}
)
)

View file

@ -41,8 +41,8 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [
cfg.finalPackage
cfg.printInitPackage
cfg.build.package
cfg.build.printInitPackage
] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
};
}

View file

@ -55,8 +55,8 @@ in
config = mkIf cfg.enable {
home.packages = [
cfg.finalPackage
cfg.printInitPackage
cfg.build.package
cfg.build.printInitPackage
] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
home.sessionVariables = mkIf cfg.defaultEditor { EDITOR = "nvim"; };

View file

@ -49,8 +49,8 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [
cfg.finalPackage
cfg.printInitPackage
cfg.build.package
cfg.build.printInitPackage
] ++ lib.optional cfg.enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
environment.variables = {

View file

@ -23,13 +23,13 @@ let
defaultPkgs = pkgs;
} // extraSpecialArgs;
};
inherit (nixvimConfig.config) enableMan finalPackage printInitPackage;
inherit (nixvimConfig.config) enableMan build;
in
(pkgs.symlinkJoin {
name = "nixvim";
paths = [
finalPackage
printInitPackage
build.package
build.printInitPackage
] ++ pkgs.lib.optional enableMan self.packages.${pkgs.stdenv.hostPlatform.system}.man-docs;
meta.mainProgram = "nvim";
})