diff options
-rw-r--r-- | lib/call-network.nix | 15 | ||||
-rw-r--r-- | lib/default.nix | 14 |
2 files changed, 16 insertions, 13 deletions
diff --git a/lib/call-network.nix b/lib/call-network.nix new file mode 100644 index 00000000..dac125e7 --- /dev/null +++ b/lib/call-network.nix @@ -0,0 +1,15 @@ +path: args: + +with builtins; + +let + machines = import path; +in listToAttrs (map (name: { + inherit name; + value = import ./call-machine.nix machines.${name} ({ + extraConfig = { lib, ... }: { + imports = lib.singleton (args.extraConfig or {}); + networking.hostName = lib.mkOverride 900 name; + }; + } // removeAttrs args [ "extraConfig" ]); +}) (attrNames machines)) diff --git a/lib/default.nix b/lib/default.nix index 2c211f6f..05118275 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,17 +1,5 @@ rec { callMachine = import ./call-machine.nix; - - callNetwork = path: args: let - machines = import path; - in with builtins; listToAttrs (map (name: { - inherit name; - value = callMachine machines.${name} ({ - extraConfig = { lib, ... }: { - imports = lib.singleton (args.extraConfig or {}); - networking.hostName = lib.mkOverride 900 name; - }; - } // removeAttrs args [ "extraConfig" ]); - }) (attrNames machines)); - + callNetwork = import ./call-network.nix; getVuizvuiTests = import ./get-tests.nix; } |