14 files changed, 66 insertions, 2 deletions

diff --git a/accounts/mherold@surtr.nix b/accounts/mherold@surtr.nix
new file mode 100644
index 00000000..64629674
--- /dev/null
+++ b/accounts/mherold@surtr.nix
@@ -0,0 +1 @@
+{...}: {}
diff --git a/accounts/mkleen@surtr.nix b/accounts/mkleen@surtr.nix
new file mode 100644
index 00000000..64629674
--- /dev/null
+++ b/accounts/mkleen@surtr.nix
@@ -0,0 +1 @@
+{...}: {}
diff --git a/accounts/mwagner@surtr.nix b/accounts/mwagner@surtr.nix
new file mode 100644
index 00000000..64629674
--- /dev/null
+++ b/accounts/mwagner@surtr.nix
@@ -0,0 +1 @@
+{...}: {}
diff --git a/accounts/some@surtr.nix b/accounts/some@surtr.nix
new file mode 100644
index 00000000..64629674
--- /dev/null
+++ b/accounts/some@surtr.nix
@@ -0,0 +1 @@
+{...}: {}
diff --git a/accounts/tkleen@surtr.nix b/accounts/tkleen@surtr.nix
new file mode 100644
index 00000000..64629674
--- /dev/null
+++ b/accounts/tkleen@surtr.nix
@@ -0,0 +1 @@
+{...}: {}
diff --git a/accounts/vkleen@surtr.nix b/accounts/vkleen@surtr.nix
new file mode 100644
index 00000000..64629674
--- /dev/null
+++ b/accounts/vkleen@surtr.nix
@@ -0,0 +1 @@
+{...}: {}
diff --git a/hosts/surtr/zfs.nix b/hosts/surtr/zfs.nix
index 3302b32b..3cbd0cf0 100644
--- a/hosts/surtr/zfs.nix
+++ b/hosts/surtr/zfs.nix
@@ -45,6 +45,12 @@ in {
           fsType = "zfs";
           neededForBoot = true;
         };
+      
+      "/var/lib/nixos" =
+        { device = "surtr/local/var-lib-nixos";
+          fsType = "zfs";
+          neededForBoot = true;
+        };
 
       "/var/log" =
         { device = "surtr/local/var-log";
diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index c5ec7025..7cf00b89 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -7,8 +7,6 @@
   users.users.${userName} = {
     description = "Gregor Kleen";
     extraGroups = [ "wheel" "networkmanager" "lp" "dialout" "audio" "video" "xmpp" "mail" "ssh" "vboxusers" "libvirtd" "wireshark" "games"];
-    group = "users";
-    uid = 1000;
     createHome = true;
     home = "/home/${userName}";
     shell = "${pkgs.zsh}/bin/zsh";
diff --git a/users/mherold.nix b/users/mherold.nix
new file mode 100644
index 00000000..54b11aab
--- /dev/null
+++ b/users/mherold.nix
@@ -0,0 +1,9 @@
+{ userName, ... }:
+{
+  users.users.${userName} = {
+    description = "Magdalena Kleen";
+    extraGroups = ["xmpp" "mail"];
+    hashedPassword = "$6$rounds=500000$y5qNae9r/U/7$HbSrmPcrPl9OQvRFMeo8PDYar32Y1i/C1R5di82rN4PPQZYxg/W.anHSI5Xws6fOQmDtvGsT0lCe4NFNxuTF41";
+    isNormalUser = true;
+  };
+}
diff --git a/users/mkleen.nix b/users/mkleen.nix
new file mode 100644
index 00000000..09e1e618
--- /dev/null
+++ b/users/mkleen.nix
@@ -0,0 +1,9 @@
+{ userName, ... }:
+{
+  users.users.${userName} = {
+    description = "Martin Kleen";
+    extraGroups = ["xmpp"];
+    hashedPassword = "$6$rounds=500000$bBm24zrmoktFD$kGLJA0I9q.jPgLSFej/1aqIyBo/KotXhA0pflByzF5LG/Vw9Vt0yfDvVYEHR6rTplJWYotdYaJXY3b4wnh9n.0";
+    isNormalUser = true;
+  };
+}
diff --git a/users/mwagner.nix b/users/mwagner.nix
new file mode 100644
index 00000000..258b4c32
--- /dev/null
+++ b/users/mwagner.nix
@@ -0,0 +1,9 @@
+{ userName, ... }:
+{
+  users.users.${userName} = {
+    description = "Max Wagner";
+    extraGroups = ["xmpp" "mail"];
+    hashedPassword = "$6$rounds=500000$5l71DQxKPXJ$UDUyiQur9QcmsXrV5r0gD5AWWpsJLe37bhV5NhZMjN4yh5aZjE4uqm8AXemuYTx3kKi.SWaRTglLIVvgDYf5l1";
+    isNormalUser = true;
+  };
+}
diff --git a/users/some.nix b/users/some.nix
new file mode 100644
index 00000000..02742e86
--- /dev/null
+++ b/users/some.nix
@@ -0,0 +1,9 @@
+{ userName, ... }:
+{
+  users.users.${userName} = {
+    description = "SomeNights";
+    extraGroups = ["xmpp" "mail"];
+    hashedPassword = "$6$rounds=500000$ZOKcPFUxFCCxbS$PSjgCpHs5GfmmusjTVEBY89NFS.hvY21.iuscfiXW8R.B2UW6ScyrIWWWPJkL4ZfI.6pKwXuf01gxazmDjy251";
+    isNormalUser = true;
+  };
+}
diff --git a/users/tkleen.nix b/users/tkleen.nix
new file mode 100644
index 00000000..debe2138
--- /dev/null
+++ b/users/tkleen.nix
@@ -0,0 +1,9 @@
+{ userName, ... }:
+{
+  users.users.${userName} = {
+    description = "Tatjana Kleen";
+    extraGroups = ["xmpp"];
+    hashedPassword = "$6$rounds=500000$K/MclfEm/LEplrSt$jKakA8dwOggI7ZB5ZwnCHVjvTGw6/VJZGVIlQGmuLoDvz24.pCnrl29xeUGItFhy6vpbjeb9GoG76RwdgI33H/";
+    isNormalUser = true;
+  };
+}
diff --git a/users/vkleen.nix b/users/vkleen.nix
new file mode 100644
index 00000000..e9717816
--- /dev/null
+++ b/users/vkleen.nix
@@ -0,0 +1,9 @@
+{ userName, ... }:
+{
+  users.users.${userName} = {
+   description = "vkleen";
+   extraGroups = ["xmpp"];
+   hashedPassword = "$6$rounds=500000$wOgtkxOshMT$3wT9nRqSCZRr9MkZcDQjMM3YbAekqCxEF0TwYcmjLqUk8Z44jeWQS96H/r3SKCfKWWcIWcQNp/dAxQ/QlcKAv.";
+   isNormalUser = true;
+  };
+}