Move callMachines into lib/

We now no longer need to import the call-machine.nix directly but now
can use import <vuizvui/lib> in order to get *both* the callMachine and
the callMachines function.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 2 insertions, 16 deletions

diff --git a/machines/default.nix b/machines/default.nix
index 13cf8f6e..b616bd9a 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -1,20 +1,6 @@
-{ system ? builtins.currentSystem, ... }:
+with import ../lib;
 
-let
-  callMachine = import ../lib/call-machine.nix;
-  callMachines = 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));
-  nixpkgs = import (import ../nixpkgs-path.nix) {};
-in {
+{
   aszlig = {
     dnyarri   = callMachine ./aszlig/dnyarri.nix {};
     mmrnmhrm  = callMachine ./aszlig/mmrnmhrm.nix {};