From 13df9a126fe0aee07ba96d2e9b2e5dfbf36cd84d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 25 Apr 2016 22:05:33 +0200
Subject: machines/labtop: fix config merging & devices

---
 machines/labnet/labtop.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'machines')

diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index 956b0377..4ac85b0e 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -2,13 +2,14 @@
 let
   callMachine = import ../../lib/call-machine.nix;
   mkLabtop = hostname: config: {
+    imports = [ config ];
     vuizvui.user.openlab.labtops.enable = true;
     networking.hostName = hostname;
-  } // config;
+  };
   mkLabtops = lib.mapAttrs (name: cfg: callMachine (mkLabtop name cfg) {});
 
   labtop = {
-    boot.loader.grub.device = "/dev/disk/by-id/ata-HITACHI_HTS722010K9SA00_080711DP0270DPGLVMPC";
+    boot.loader.grub.device = "/dev/sda";
 
     boot.kernelModules = [ "kvm-intel" ];
     boot.initrd.availableKernelModules = [
@@ -16,7 +17,7 @@ let
     ];
 
     fileSystems."/" = {
-      device = "/dev/disk/by-uuid/754fd3e3-2e04-4028-9363-0c6bb4c54367";
+      device = "/dev/sda1";
       fsType = "ext4";
     };
 
@@ -26,6 +27,13 @@ let
 
     networking.enableIntel3945ABGFirmware = true;
 
+
+    users.users.kevin = {
+      isNormalUser = true;
+      password = "kevin";
+    };
+    users.users.root.password = "root";
+
   };
 
 
@@ -34,10 +42,9 @@ let
     boot.loader.grub.device = "/dev/sda";
 
     fileSystems."/" = {
-      device = "/dev/sda";
+      device = "/dev/sda1";
       fsType = "ext4";
     };
-
   };
 
 in
-- 
cgit 1.4.1