hosts: simplify builders

This commit is contained in:
Nikodem Rabuliński 2025-03-31 21:58:09 +02:00
parent 954b1b0b8d
commit cde0371741
Signed by: nrabulinski
SSH key fingerprint: SHA256:AZZVyfKStaCo8sbJB+3Rr/CRrlym1oEgw7vMnynJeR8

View file

@ -26,28 +26,14 @@ in
settei = inputs.self; settei = inputs.self;
}; };
}; };
baseNixos = inputs.nixpkgs.lib.nixosSystem {
modules = [
config.nixosModules.combined
sharedOptions
];
specialArgs.configurationName = "base";
};
baseDarwin = inputs.darwin.lib.darwinSystem {
modules = [
config.darwinModules.combined
sharedOptions
];
specialArgs.configurationName = "base";
};
in in
{ {
nixos = nixos =
name: module: name: module:
baseNixos.extendModules { inputs.nixpkgs.lib.nixosSystem {
modules = [ modules = [
config.nixosModules.combined
sharedOptions
module module
config.extraHostConfigs.${name} or { } config.extraHostConfigs.${name} or { }
]; ];
@ -56,18 +42,14 @@ in
darwin = darwin =
name: module: name: module:
let inputs.darwin.lib.darwinSystem {
eval = baseDarwin._module.args.extendModules { modules = [
modules = [ config.darwinModules.combined
module sharedOptions
config.extraHostConfigs.${name} or { } module
]; config.extraHostConfigs.${name} or { }
specialArgs.configurationName = name; ];
}; specialArgs.configurationName = name;
in
eval
// {
system = eval.config.system.build.toplevel;
}; };
}; };
} }