nix: merge nix.settings.trusted-users by default

Backport of NixOS/nixpkgs#318635
LnL7 · Jan 8, 2025 · 9e856ad · 9e856ad
1 parent ba9b317
commit 9e856ad
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
@@ -617,7 +617,6 @@ in
 
             trusted-users = mkOption {
               type = types.listOf types.str;
-              default = [ "root" ];
               example = [ "root" "alice" "@admin" ];
               description = ''
                 A list of names of users that have additional rights when
@@ -835,10 +834,10 @@ in
       done
     '';
 
-    # Legacy configuration conversion.
     nix.settings = mkMerge [
       {
         trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
+        trusted-users = [ "root" ];
         substituters = mkAfter [ "https://cache.nixos.org/" ];
 
         # Not implemented yet