buildClan: fix importing machines from settings
All checks were successful
checks-impure / test (pull_request) Successful in 12s
checks / test (pull_request) Successful in 9m40s

This commit is contained in:
Jörg Thalheim 2023-09-03 15:18:29 +02:00
parent 618fb4b8a7
commit d51dd39ae3

View File

@ -4,15 +4,12 @@
, machines ? { } # allows to include machine-specific modules i.e. machines.${name} = { ... }
}:
let
machinesDirs =
if builtins.pathExists "${directory}/machines"
then builtins.readDir directory + /machines
else { };
machinesDirs = lib.optionalAttrs (builtins.pathExists "${directory}/machines") (builtins.readDir (directory + /machines));
machineSettings = machineName:
if builtins.pathExists "${directory}/machines/${machineName}/settings.json"
then builtins.fromJSON (builtins.readFile directory + /machines/${machineName}/settings.json)
else { };
lib.optionalAttrs (builtins.pathExists "${directory}/machines/${machineName}/settings.json")
builtins.fromJSON
(builtins.readFile (directory + /machines/${machineName}/settings.json));
nixosConfigurations = lib.mapAttrs
(name: _: