moved user configuration to common

enviroments/common/default.nix

@@ -31,7 +31,82 @@
     LC_TIME = "en_US.UTF-8";
   };
 
-  users.groups.users = {};
+  users = {
+    users = {
+      leyla = {
+        uid = 1000;
+        description = "Leyla";
+        group = "leyla";
+      };
+
+      ester = {
+        uid = 1001;
+        description = "Ester";
+        group = "ester";
+      };
+
+      eve = {
+        uid = 1002;
+        description = "Eve";
+        group = "eve";
+      };
+
+      jellyfin = {
+        uid = 2000;
+        group = "jellyfin";
+        isSystemUser = true;
+      };
+
+      forgejo = {
+        uid = 2002;
+        group = "forgejo";
+        isSystemUser = true;
+      };
+
+      # pihole = {
+      #   uid = 2003;
+      #   group = "forgejo";
+      #   isSystemUser = true;
+      # };
+    };
+
+    groups = {
+      leyla = {
+        gid = 1000;
+        members = ["lelya"];
+      };
+
+      ester = {
+        gid = 1001;
+        members = ["ester"];
+      };
+
+      eve = {
+        gid = 1002;
+        members = ["eve"];
+      };
+
+      jellyfin = {
+        gid = 2000;
+        members = ["jellyfin" "leyla"];
+      };
+
+      jellyfin_media = {
+        gid = 2001;
+        members = ["jellyfin" "leyla" "ester" "eve"];
+      };
+
+      forgejo = {
+        gid = 2002;
+        members = ["forgejo" "leyla"];
+      };
+
+      # pihole = {
+      #   gid = 2003;
+      #   members = ["pihole" "leyla"];
+      # };
+    };
+  };
 
   services = {
     openssh = {

enviroments/server/default.nix

@@ -48,50 +48,6 @@
   };
 
   config = {
-    users = {
-      groups = {
-        jellyfin = {
-          gid = 2000;
-          members = ["jellyfin" "leyla"];
-        };
-
-        jellyfin_media = {
-          gid = 2001;
-          members = ["jellyfin" "leyla" "ester" "eve"];
-        };
-
-        forgejo = {
-          gid = 2002;
-          members = ["forgejo" "leyla"];
-        };
-
-        # pihole = {
-        #   gid = 2003;
-        #   members = ["pihole" "leyla"];
-        # };
-      };
-
-      users = {
-        jellyfin = {
-          uid = 2000;
-          group = "jellyfin";
-          isSystemUser = true;
-        };
-
-        forgejo = {
-          uid = 2002;
-          group = "forgejo";
-          isSystemUser = true;
-        };
-
-        # pihole = {
-        #   uid = 2003;
-        #   group = "forgejo";
-        #   isSystemUser = true;
-        # };
-      };
-    };
-
     # virtualisation.oci-containers.containers.pihole = {
     #   image = "pihole/pihole:latest";
     #   environment = {

users/ester/default.nix

@@ -18,16 +18,7 @@ in {
       };
     };
 
-    users.groups.ester = {};
-
-    users.users.ester = lib.mkMerge [
-      {
-        uid = 1001;
-        description = "Ester";
-        group = "ester";
-      }
-
-      (
+    users.users.ester = (
       if cfg.isFullUser
       then {
         isNormalUser = true;
@@ -44,7 +35,6 @@ in {
       else {
         isSystemUser = true;
       }
-      )
-    ];
+    );
   };
 }

users/eve/default.nix

@@ -18,16 +18,7 @@ in {
       };
     };
 
-    users.groups.eve = {};
-
-    users.users.eve = lib.mkMerge [
-      {
-        uid = 1002;
-        description = "Eve";
-        group = "eve";
-      }
-
-      (
+    users.users.eve = (
       if cfg.isFullUser
       then {
         isNormalUser = true;
@@ -46,7 +37,6 @@ in {
       else {
         isSystemUser = true;
       }
-      )
-    ];
+    );
   };
 }

users/leyla/default.nix

@@ -24,16 +24,7 @@ in {
       };
     };
 
-    users.groups.leyla = {};
-
-    users.users.leyla = lib.mkMerge [
-      {
-        uid = 1000;
-        description = "Leyla";
-        group = "leyla";
-      }
-
-      (
+    users.users.leyla = (
       if (cfg.isFullUser || cfg.isThinUser)
       then {
         isNormalUser = true;
@@ -56,8 +47,7 @@ in {
       else {
         isSystemUser = true;
       }
-      )
-    ];
+    );
 
     # TODO: this should reference the home directory from the user config
     services.openssh.hostKeys = [