home

commit 87210ef67101b7b767ff44ae56ebb3d8b9e3c9b3
parent 0e95f7a12fa6345cf50c9a833b0169f87696fdf2
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 13 May 2024 16:17:57 +0200

nix: update nix options (using nix.settings)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
systems/modules/core/nix.nix
 | 
8
+++++---
M
users/vincent/default.nix
 | 
4
+++-

2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/systems/modules/core/nix.nix b/systems/modules/core/nix.nix
@@ -40,7 +40,6 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.git ];
     nix = {
-      allowedUsers = [ "@wheel" ];
       settings = {
         cores = cfg.buildCores;
         substituters = cfg.localCaches ++ [
@@ -94,8 +93,11 @@ in
       };
       nrBuildUsers = 32;
       #nrBuildUsers = config.nix.maxJobs * 2;
-      trustedUsers = [ "root" "@wheel" ];
-      useSandbox = true;
+      settings = {
+        sandbox = true;
+        allowed-users = [ "@wheel" ];
+        trusted-users = [ "root" "@wheel" ];
+      };
     };
 
     # `nix-daemon` will hit the stack limit when using `nixFlakes`.
diff --git a/users/vincent/default.nix b/users/vincent/default.nix
@@ -41,7 +41,9 @@ in
   };
 
   nix = {
-    trustedUsers = [ "vincent" ];
+    settings = {
+      trusted-users = [ "vincent" ];
+    };
     sshServe.keys = authorizedKeys;
   };