From e58e8550db63203bd3686e82758b961442a92d0b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 15 Feb 2016 10:37:32 +0100
Subject: Use users.users/users.groups instead of extra*

It has been renamed since months (NixOS/nixpkgs@14321ae) and
users.extra* are now just aliases to users.users and users.groups.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/aszlig/dnyarri.nix                          | 2 +-
 machines/aszlig/kzerza.nix                           | 4 ++--
 machines/aszlig/managed/haenk.nix                    | 2 +-
 machines/aszlig/managed/tyree.nix                    | 2 +-
 machines/labnet/labtop.nix                           | 2 +-
 machines/profpatsch/katara.nix                       | 2 +-
 machines/sternenseemann/fliewatuet.nix               | 2 +-
 machines/sternenseemann/schnurrkadse.nix             | 2 +-
 modules/user/aszlig/profiles/workstation/default.nix | 7 ++-----
 9 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/machines/aszlig/dnyarri.nix b/machines/aszlig/dnyarri.nix
index 5192e955..a041486e 100644
--- a/machines/aszlig/dnyarri.nix
+++ b/machines/aszlig/dnyarri.nix
@@ -109,7 +109,7 @@ with lib;
   # TODO: Try to avoid this, but as there is only a single user using audio on
   # this machine, it's okay for now. But remember that this will break heavily,
   # should there be another user accessing the audio devices.
-  users.extraUsers.aszlig.extraGroups = [ "audio" "vboxusers" ];
+  users.users.aszlig.extraGroups = [ "audio" "vboxusers" ];
 
   services.synergy.client.enable = true;
   services.synergy.client.serverAddress = "mmrnmhrm";
diff --git a/machines/aszlig/kzerza.nix b/machines/aszlig/kzerza.nix
index 91fbe09c..41b380b9 100644
--- a/machines/aszlig/kzerza.nix
+++ b/machines/aszlig/kzerza.nix
@@ -40,8 +40,8 @@ in {
   fileSystems."/tmp".fsType = "tmpfs";
   fileSystems."/tmp".options = [ "nosuid" "nodev" "relatime" ];
 
-  users.extraGroups.grandpa.gid = 666;
-  users.extraUsers.grandpa = {
+  users.groups.grandpa.gid = 666;
+  users.users.grandpa = {
     uid = 666;
     description = "GrandPA User";
     group = "grandpa";
diff --git a/machines/aszlig/managed/haenk.nix b/machines/aszlig/managed/haenk.nix
index 75730ff4..c7d83131 100644
--- a/machines/aszlig/managed/haenk.nix
+++ b/machines/aszlig/managed/haenk.nix
@@ -85,7 +85,7 @@
 
   time.timeZone = "Europe/Berlin";
 
-  users.extraUsers.bla = {
+  users.users.bla = {
     isNormalUser = true;
     uid = 1000;
     extraGroups = [ "video" "wheel" ];
diff --git a/machines/aszlig/managed/tyree.nix b/machines/aszlig/managed/tyree.nix
index c44f83b3..47f7eb47 100644
--- a/machines/aszlig/managed/tyree.nix
+++ b/machines/aszlig/managed/tyree.nix
@@ -68,7 +68,7 @@
 
   time.timeZone = "Europe/Berlin";
 
-  users.extraUsers.bla = {
+  users.users.bla = {
     isNormalUser = true;
     uid = 1000;
     extraGroups = [ "video" "wheel" ];
diff --git a/machines/labnet/labtop.nix b/machines/labnet/labtop.nix
index 4bf02c85..b3943204 100644
--- a/machines/labnet/labtop.nix
+++ b/machines/labnet/labtop.nix
@@ -113,7 +113,7 @@ in {
   nix.maxJobs = 2;
 
   users.mutableUsers = false;
-  users.extraUsers.openlab = {
+  users.users.openlab = {
     uid = 1000;
     isNormalUser = true;
     password = "openlab";
diff --git a/machines/profpatsch/katara.nix b/machines/profpatsch/katara.nix
index 00cbe88b..9d024888 100644
--- a/machines/profpatsch/katara.nix
+++ b/machines/profpatsch/katara.nix
@@ -299,7 +299,7 @@ in {
 
     # Nobody wants mutable state. :)
     users.mutableUsers = false;
-    users.extraUsers =
+    users.users =
       let authKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJhthfk38lzDvoI7lPqRneI0yBpZEhLDGRBpcXzpPSu+V0YlgrDix5fHhBl+EKfw4aeQNvQNuAky3pDtX+BDK1b7idbz9ZMCExy2a1kBKDVJz/onLSQxiiZMuHlAljVj9iU4uoTOxX3vB85Ok9aZtMP1rByRIWR9e81/km4HdfZTCjFVRLWfvo0s29H7l0fnbG9bb2E6kydlvjnXJnZFXX+KUM16X11lK53ilPdPJdm87VtxeSKZ7GOiBz6q7FHzEd2Zc3CnzgupQiXGSblXrlN22IY3IWfm5S/8RTeQbMLVoH0TncgCeenXH7FU/sXD79ypqQV/WaVVDYMOirsnh/ philip@nyx"];
       in {
         philip = rec {
diff --git a/machines/sternenseemann/fliewatuet.nix b/machines/sternenseemann/fliewatuet.nix
index 6c8994ee..94d84287 100644
--- a/machines/sternenseemann/fliewatuet.nix
+++ b/machines/sternenseemann/fliewatuet.nix
@@ -256,7 +256,7 @@ in {
   programs.fish.enable = true;
 
   users.mutableUsers = false;
-  users.extraUsers.lukas = {
+  users.users.lukas = {
     isNormalUser = true;
     uid = 1000;
     home = "/home/lukas";
diff --git a/machines/sternenseemann/schnurrkadse.nix b/machines/sternenseemann/schnurrkadse.nix
index 46e6dfb8..fc38373f 100644
--- a/machines/sternenseemann/schnurrkadse.nix
+++ b/machines/sternenseemann/schnurrkadse.nix
@@ -104,7 +104,7 @@
 
   programs.fish.enable = true;
 
-  users.extraUsers.lukas = {
+  users.users.lukas = {
     isNormalUser = true;
     uid = 1000;
     shell = "/run/current-system/sw/bin/fish";
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 2e0d8a40..01eaaeaf 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -165,14 +165,11 @@ in {
 
     virtualisation.virtualbox.host.enable = true;
 
-    users.extraUsers.aszlig = {
+    users.users.aszlig = {
       uid = 1000;
+      isNormalUser = true;
       description = "aszlig";
-      group = "users";
       extraGroups = [ "wheel" "video" ];
-      home = "/home/aszlig";
-      useDefaultShell = true;
-      createHome = true;
     };
   };
 }
-- 
cgit 1.4.1