about summary refs log tree commit diff
path: root/machines/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-12-15 04:30:10 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-12-15 04:30:10 +0100
commit8c1b7661ae7801233df2ef5cacb07c7382d74fdd (patch)
treec69e6fddd776b5ce0c92f870437637de82e62191 /machines/default.nix
parent2c5b52769214bfb36bdaf5957e32b667f7d87b65 (diff)
lib/call-machine: Clean up expression
This gets rid of the use attribute, which is now called "config". We had
the "config" attribute before but it was kinda pointless, because it was
just the import of the path and nothing else.

So the config attribute now is the machine configuration with all of the
vuizvui modules imported as well.

The "build" attribute is now called "eval", which is more appropriate,
because it's the evaluation of the configuration and not the finished
system build.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines/default.nix')
-rw-r--r--machines/default.nix22
1 files changed, 11 insertions, 11 deletions
diff --git a/machines/default.nix b/machines/default.nix
index 9c2911dd..9fdd7190 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -1,26 +1,26 @@
 { system ? builtins.currentSystem, ... }:
 
 let
-  callMachine = import ../lib/call-machine.nix system;
+  callMachine = import ../lib/call-machine.nix;
 in {
   aszlig = {
-    dnyarri   = callMachine ./aszlig/dnyarri.nix;
-    mmrnmhrm  = callMachine ./aszlig/mmrnmhrm.nix;
-    arilou    = callMachine ./aszlig/arilou.nix;
-    kzerza    = callMachine ./aszlig/kzerza.nix;
-    tishtushi = callMachine ./aszlig/tishtushi.nix;
+    dnyarri   = callMachine ./aszlig/dnyarri.nix {};
+    mmrnmhrm  = callMachine ./aszlig/mmrnmhrm.nix {};
+    arilou    = callMachine ./aszlig/arilou.nix {};
+    kzerza    = callMachine ./aszlig/kzerza.nix {};
+    tishtushi = callMachine ./aszlig/tishtushi.nix {};
     managed = {
-      notsure = callMachine ./aszlig/managed/notsure.nix;
+      notsure = callMachine ./aszlig/managed/notsure.nix {};
     };
   };
   labnet = {
-    heinrich = callMachine ./labnet/heinrich.nix;
-    labtop   = callMachine ./labnet/labtop.nix;
+    heinrich = callMachine ./labnet/heinrich.nix {};
+    labtop   = callMachine ./labnet/labtop.nix {};
   };
   profpatsch = {
-    katara = callMachine ./profpatsch/katara.nix;
+    katara = callMachine ./profpatsch/katara.nix {};
   };
   misc = {
-    mailserver = callMachine ./misc/mailserver.nix;
+    mailserver = callMachine ./misc/mailserver.nix {};
   };
 }