machines: Integrate heinrich+labtop from labernix.

So far I'm not quite sure whether mailserver really belongs to labnet,
so I'm leaving it at the labernix subtree. Maybe it even makes sense to
just make it a profile until we have it on a real machine.

We no longer need common.nix for these machines, because it is already
done via callMachine.

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

3 files changed, 5 insertions, 3 deletions

diff --git a/machines/default.nix b/machines/default.nix
index baceb647..51f446b1 100644
--- a/machines/default.nix
+++ b/machines/default.nix
@@ -17,4 +17,8 @@ in {
     kzerza    = callMachine ./aszlig/kzerza.nix;
     tishtushi = callMachine ./aszlig/tishtushi.nix;
   };
+  labnet = {
+    heinrich = callMachine ./labnet/heinrich.nix;
+    labtop   = callMachine ./labnet/labtop.nix;
+  };
 }
diff --git a/labernix/machines/heinrich.nix b/machines/labnet/heinrich.nix
index 8ce69950..3eaddea5 100644
--- a/labernix/machines/heinrich.nix
+++ b/machines/labnet/heinrich.nix
@@ -43,7 +43,7 @@ let
   };
 
 in {
-  imports = singleton ../common.nix ++ mapAttrsToList mkRouteConfig routes;
+  imports = mapAttrsToList mkRouteConfig routes;
 
   options.heinrich = {
     internalInterface = mkOption {
diff --git a/labernix/machines/labtop.nix b/machines/labnet/labtop.nix
index bf376ba5..a66ceea3 100644
--- a/labernix/machines/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -24,8 +24,6 @@ let
   };
 
 in {
-  imports = [ ../common.nix ];
-
   i18n = {
     consoleFont = "lat9w-16";
     consoleKeyMap = "us";