Merge remote-tracking branch 'cd/master'

7 files changed, 8 insertions, 9 deletions

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 9b2200c5..61f57f1f 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -210,7 +210,6 @@
     cac
     sshpass
     get
-    genid
     teamspeak_client
     hashPassword
   ];
diff --git a/lass/2configs/libvirt.nix b/lass/2configs/libvirt.nix
index 368722e7..7520a0e3 100644
--- a/lass/2configs/libvirt.nix
+++ b/lass/2configs/libvirt.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   mainUser = config.users.extraUsers.mainUser;
@@ -8,7 +8,7 @@ in {
 
   users.extraUsers = {
     libvirt = {
-      uid = 358821352; # genid libvirt
+      uid = lib.genid "libvirt";
       description = "user for running libvirt stuff";
       home = "/home/libvirt";
       useDefaultShell = true;
diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix
index 6a226441..d62a18a5 100644
--- a/lass/2configs/skype.nix
+++ b/lass/2configs/skype.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   mainUser = config.users.extraUsers.mainUser;
@@ -7,7 +7,7 @@ in {
   users.extraUsers = {
     skype = {
       name = "skype";
-      uid = 2259819492; #genid skype
+      uid = lib.genid "skype";
       description = "user for running skype";
       home = "/home/skype";
       useDefaultShell = true;
diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix
index 18007ed6..6a257f0b 100644
--- a/lass/2configs/weechat.nix
+++ b/lass/2configs/weechat.nix
@@ -8,7 +8,7 @@
 
   users.extraUsers.chat = {
     home = "/home/chat";
-    uid = 986764891; # genid chat
+    uid = lib.genid "chat";
     useDefaultShell = true;
     createHome = true;
     openssh.authorizedKeys.keys = [
diff --git a/lass/3modules/newsbot-js.nix b/lass/3modules/newsbot-js.nix
index 6d87d256..5e340b26 100644
--- a/lass/3modules/newsbot-js.nix
+++ b/lass/3modules/newsbot-js.nix
@@ -51,7 +51,7 @@ let
   imp = {
     users.extraUsers.newsbot-js = {
       name = "newsbot-js";
-      uid = 1616759810; #genid newsbot-js
+      uid = genid "newsbot-js";
       description = "newsbot-js user";
       home = "/var/empty";
     };
diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix
index a0db87b0..0cb11846 100644
--- a/lass/3modules/owncloud_nginx.nix
+++ b/lass/3modules/owncloud_nginx.nix
@@ -207,7 +207,7 @@ let
     #  };
     #});
     users.users.nobody_oc = {
-      uid = 1651469147; # genid nobody_oc
+      uid = genid "nobody_oc";
       useDefaultShell = true;
     };
   };
diff --git a/lass/3modules/wordpress_nginx.nix b/lass/3modules/wordpress_nginx.nix
index 2f31f6e0..974aacd8 100644
--- a/lass/3modules/wordpress_nginx.nix
+++ b/lass/3modules/wordpress_nginx.nix
@@ -229,7 +229,7 @@ let
       };
     });
     users.users.nobody2 = mkDefault {
-      uid = mkDefault 125816384; # genid nobody2
+      uid = mkDefault (genid "nobody2");
       useDefaultShell = mkDefault true;
     };
   };