yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

allow passing of extra_config into machines

Browse Source
This commit is contained in:
lassulus
2024-02-10 11:47:09 +01:00
parent 0dc0ee5b80
commit a94201c1d0
6 changed files with 123 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/build-clan/default.nix
View File

@@ -30,13 +30,14 @@ let
(machineSettings.clanImports or [ ]);
# TODO: remove default system once we have a hardware-config mechanism
nixosConfiguration = { system ? "x86_64-linux", name, pkgs ? null }: nixpkgs.lib.nixosSystem {
nixosConfiguration = { system ? "x86_64-linux", name, pkgs ? null, extraConfig ? { } }: nixpkgs.lib.nixosSystem {
modules =
let
settings = machineSettings name;
in
(machineImports settings)
++ [
(nixpkgs.lib.mkOverride 51 extraConfig)
settings
clan-core.nixosModules.clanCore
(machines.${name} or { })
@@ -77,7 +78,13 @@ let
configsPerSystem = builtins.listToAttrs
(builtins.map
(system: lib.nameValuePair system
(lib.mapAttrs (name: _: nixosConfiguration { inherit name system; pkgs = nixpkgs.legacyPackages.${system}; }) allMachines))
(lib.mapAttrs (name: _: nixosConfiguration { inherit name system; }) allMachines))
supportedSystems);
configsFuncPerSystem = builtins.listToAttrs
(builtins.map
(system: lib.nameValuePair system
(lib.mapAttrs (name: _: args: nixosConfiguration (args // { inherit name system; })) allMachines))
supportedSystems);
in
{
@@ -85,6 +92,7 @@ in
clanInternals = {
machines = configsPerSystem;
machinesFunc = configsFuncPerSystem;
all-machines-json = lib.mapAttrs
(system: configs: nixpkgs.legacyPackages.${system}.writers.writeJSON "machines.json" (lib.mapAttrs (_: m: m.config.system.clan.deployment.data) configs))
configsPerSystem;