From 9e856ad0c1a677d1585e53a634c4abe487601c51 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:26:32 +1100
Subject: [PATCH] nix: merge `nix.settings.trusted-users` by default

Backport of https://github.com/NixOS/nixpkgs/pull/318635
---
 modules/nix/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index 41398fac1..6e4292a33 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