modules/nixos: refactor users

modules/nixos/common/default.nix

@@ -23,11 +23,6 @@
   nix.settings.auto-optimise-store = true;
   nix.optimise.automatic = false;
 
-  # users in trusted group are trusted by the nix-daemon
-  nix.settings.trusted-users = [ "@trusted" ];
-
-  users.groups.trusted = { };
-
   # Sometimes it fails if a store path is still in use.
   # This should fix intermediate issues.
   systemd.services.nix-gc.serviceConfig = {

modules/nixos/common/users.nix

@@ -14,6 +14,11 @@ in
 {
   imports = userImports;
 
+  # users in trusted group are trusted by the nix-daemon
+  nix.settings.trusted-users = [ "@trusted" ];
+
+  users.groups.trusted = { };
+
   # No mutable users
   users.mutableUsers = false;
 }

modules/nixos/community-builder/users.nix

@@ -195,8 +195,5 @@ let
   };
 in
 {
-  users = {
-    mutableUsers = false;
-    users = lib.mapAttrs descToUser users;
-  };
+  users.users = lib.mapAttrs descToUser users;
 }