manuth/NixOSConfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unify the machine configuration centrally

Browse source
This commit is contained in:
Manuel Thalmann 2024-05-11 01:22:32 +02:00
parent 34bdf1ca0b
commit 27150198e0
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
flake.nix
View file

@ -35,7 +35,14 @@
};
};
machines = builtins.mapAttrs (name: value: defaultMachine // value) machineDefinitions;
machines = builtins.mapAttrs (
name: machineDefinition:
defaultMachine // machineDefinition // {
config = { ... }@args:
((defaultMachine.config args) // (machineDefinition.config args));
})
machineDefinitions;
tryFiles = import ./lib/utils/try-files.nix { inherit lib; };
in
flake-utils.lib.eachDefaultSystem (
@ -83,8 +90,7 @@
config._module.args = {
inherit hostname;
machineConfig = (defaultMachine.config args) //
(config args) // {
machineConfig = (config args) // {
inherit hostname;
};
};
@ -104,10 +110,6 @@
lib.attrsets.concatMapAttrs (
hostname: machine:
let
machineConfig = { ... }@args:
(defaultMachine.config args) //
(machine.config args);
pkgs = import nixpkgs {
inherit (machine) system;
};
@ -136,7 +138,7 @@
] ++ (lib.optional (userConfigPath != null) userConfigPath);
};
})
(machineConfig { inherit pkgs; }).users)
(machine.config { inherit pkgs; }).users)
machines;
});
}