diff options
| author | Michael Hoang <enzime@users.noreply.github.com> | 2025-01-08 14:26:32 +1100 |
|---|---|---|
| committer | Michael Hoang <enzime@users.noreply.github.com> | 2025-01-08 14:27:40 +1100 |
| commit | 9e856ad0c1a677d1585e53a634c4abe487601c51 (patch) | |
| tree | 5605ed5a5f6d6220648aa416e2359576aaf8e871 /modules | |
| parent | ba9b3173b0f642ada42b78fb9dfc37ca82266f6c (diff) | |
nix: merge `nix.settings.trusted-users` by default
Backport of https://github.com/NixOS/nixpkgs/pull/318635
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/nix/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 41398fa..6e4292a 100644 --- 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 |