2 files changed, 17 insertions, 16 deletions
diff --git a/lib/default.nix b/lib/default.nix
new file mode 100644
index 00000000..30661328
--- /dev/null
+++ b/lib/default.nix
@@ -0,0 +1,15 @@
+rec {
+  callMachine = import ./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));
+}
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 {};