DavHau/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

buildClan: fix importing machines from settings

Browse Source
This commit is contained in:
Jörg Thalheim 2023-09-03 15:18:29 +02:00
parent 618fb4b8a7
commit d51dd39ae3
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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