Lots of user changes and also Spacebar

modules/system/accounts/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   imports = [
     ./users
     ./groups

modules/system/accounts/users/custom/default.nix

@@ -1,7 +0,0 @@
-{ home-manager, ... }:
-{
-  imports = [
-    ./main
-    home-manager.nixosModules.home-manager
-  ];
-}

modules/system/accounts/users/default.nix

@@ -1,9 +1,7 @@
-{ ... }:
+{ home-manager, ... }:
 {
   imports = [
-    ./custom
-    ./system
+    ./main
+    home-manager.nixosModules.home-manager
   ];
-
-  users.mutableUsers = false;
 }

modules/system/accounts/users/main/default.nix

@@ -12,14 +12,14 @@
       isNormalUser = true;
       createHome = true;
       openssh.authorizedKeys.keyFiles = [
-        ../../../../../../hosts/tower/id_ed25519.pub
+        ../../../../../hosts/tower/id_ed25519.pub
 
-        ../../../../../../hosts/envy/id_ed25519.pub
-        ../../../../../../hosts/pear/id_ed25519.pub
-        ../../../../../../hosts/redmond/id_ed25519.pub
+        ../../../../../hosts/envy/id_ed25519.pub
+        ../../../../../hosts/pear/id_ed25519.pub
+        ../../../../../hosts/redmond/id_ed25519.pub
 
-        ../../../../../../hosts/midas/id_ed25519.pub
-        ../../../../../../hosts/prophet/id_ed25519.pub
+        ../../../../../hosts/midas/id_ed25519.pub
+        ../../../../../hosts/prophet/id_ed25519.pub
       ];
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
@@ -43,6 +43,6 @@
       shell = pkgs.zsh;
     };
 
-    home-manager.users."${config.sysusers.main}" = import ../../../../../home;
+    home-manager.users."${config.sysusers.main}" = import ../../../../home;
   };
 }

modules/system/accounts/users/system/default.nix

@@ -1,9 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./jellyfin
-    ./liquidsoap
-    ./nextcloud
-    ./nginx
-  ];
-}

modules/system/accounts/users/system/jellyfin/default.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-  users = {
-    users.jellyfin = {
-      group = "jellyfin";
-      extraGroups = [ "nfsShare" ];
-      isSystemUser = true;
-      uid = 983;
-    };
-    groups.jellyfin = {};
-  };
-}

modules/system/accounts/users/system/liquidsoap/default.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-  users = {
-    users.liquidsoap = {
-      group = "liquidsoap";
-      extraGroups = [ "nginx" ];
-      isSystemUser = true;
-      uid = 155;
-    };
-    groups.liquidsoap = {};
-  };
-}

modules/system/accounts/users/system/nextcloud/default.nix

@@ -1,12 +0,0 @@
-{ ... }:
-{
-  users = {
-    users.nextcloud = {
-      group = "nextcloud";
-      extraGroups = [ "nfsShare" ];
-      isSystemUser = true;
-      uid = 218;
-    };
-    groups.nextcloud = {};
-  };
-}

modules/system/accounts/users/system/nginx/default.nix

@@ -1,15 +0,0 @@
-{ ... }:
-{
-  users = {
-    users.nginx = {
-      group = "nginx";
-      extraGroups = [
-        "turnserver"
-        "virtualMail"
-      ];
-      isSystemUser = true;
-      uid = 60;
-    };
-    groups.nginx = {};
-  };
-}