fix user settings

1 files changed, 17 insertions, 5 deletions

diff --git a/modules/users.nix b/modules/users.nix
index 1f8d6ad..55ca975 100644
--- a/modules/users.nix
+++ b/modules/users.nix
@@ -5,7 +5,7 @@ let
 in {
   users = {
     defaultUserShell = pkgs.zsh;
-    extraUsers = {
+    users = {
       orbekk = {
         isNormalUser = true;
         home = "/home/orbekk";
@@ -27,6 +27,7 @@ in {
         group = "fcgi";
         extraGroups = ["readonly"];
         uid = 500;
+        isSystemUser = true;
       };
       systemhttpd = {
         name = "systemhttpd";
@@ -34,6 +35,7 @@ in {
         createHome = true;
         uid = 502;
         home = "/var/lib/systemhttpd";
+        isSystemUser = true;
       };
       linoquotes = {
         name = "linoquotes";
@@ -41,11 +43,13 @@ in {
         createHome = true;
         uid = 503;
         home = "/var/lib/linoquotes";
+        isSystemUser = true;
       };
       minecraft = {
         name = "minecraft";
         uid = config.ids.uids.minecraft;
         extraGroups = ["readonly"];
+        isSystemUser = true;
       };
       stats = {
         name = "stats";
@@ -53,6 +57,7 @@ in {
         createHome = true;
         uid = 504;
         home = aliases.services.stats.home;
+        isSystemUser = true;
       };
       terraria = {
         name = "terraria";
@@ -60,6 +65,7 @@ in {
         createHome = true;
         uid = 505;
         home = "/var/lib/terraria";
+        isSystemUser = true;
       };
       readonly = {
         group = "readonly";
@@ -67,28 +73,34 @@ in {
         uid = 506;
         useDefaultShell = true;
         home = "/storage";
+        isNormalUser = true;
       };
       pjournal = {
         group = "pjournal";
         createHome = false;
         uid = 507;
+        isNormalUser = true;
       };
       pjournal_test = {
         group = "pjournal_test";
         createHome = false;
         uid = 508;
+        isSystemUser = true;
       };
-      builder = lib.optionalAttrs enableBuilder {
+      builder = lib.mkIf enableBuilder {
+        isSystemUser = true;
         openssh.authorizedKeys.keys = [
           "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA2W9SkVc1xKo5QiYOgbCgZbPlFhZLrbG1lS7TUjiZwi root@firelink"
         ];
-        uid = 509;
         useDefaultShell = true;
       };
-      mpd = lib.optionalAttrs config.services.mpd.enable {
+      mpd = lib.mkIf config.services.mpd.enable {
+        isSystemUser = true;
+        group = "mpd";
         extraGroups = ["readonly"];
       };
-      nginx = lib.optionalAttrs config.services.nginx.enable {
+      nginx = lib.mkIf config.services.nginx.enable {
+        isSystemUser = true;
         extraGroups = ["readonly"]; 
       };
     };