Merge remote-tracking branch 'prism/master' into head

5 files changed, 12 insertions, 12 deletions

diff --git a/makefu/2configs/binary-cache/gum.nix b/makefu/2configs/binary-cache/gum.nix
index fc54bd917..fc6e26fe0 100644
--- a/makefu/2configs/binary-cache/gum.nix
+++ b/makefu/2configs/binary-cache/gum.nix
@@ -2,11 +2,11 @@
 { config, ... }:
 
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://cache.euer.krebsco.de/"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "gum:iIXIFlCAotib+MgI3V/i3HMlFXiVYOT/jfP0y54Zuvg="
     ];
   };
diff --git a/makefu/2configs/binary-cache/lass.nix b/makefu/2configs/binary-cache/lass.nix
index 51b4a1afc..7d7549d8d 100644
--- a/makefu/2configs/binary-cache/lass.nix
+++ b/makefu/2configs/binary-cache/lass.nix
@@ -1,11 +1,11 @@
 { config, ... }:
 
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://cache.krebsco.de"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "cache.prism-1:+S+6Lo/n27XEtvdlQKuJIcb1yO5NUqUCE2lolmTgNJU="
       "cache.prism-2:YwmCm3/s/D+SxrPKN/ETjlpw/219pNUbpnluatp6FKI="
     ];
diff --git a/makefu/2configs/binary-cache/nixos.nix b/makefu/2configs/binary-cache/nixos.nix
index 2ff5e1307..299130059 100644
--- a/makefu/2configs/binary-cache/nixos.nix
+++ b/makefu/2configs/binary-cache/nixos.nix
@@ -1,11 +1,11 @@
 { config, ... }:
 
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://cache.nixos.org/"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     ];
   };
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index ef4f8fbcd..2bfb42732 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -30,7 +30,7 @@ with import <stockholm/lib>;
         openssh.authorizedKeys.keys = [ config.krebs.users.makefu.pubkey ];
     };
   };
-  nix.trustedUsers = [ config.krebs.build.user.name ];
+  nix.settings.trusted-users = [ config.krebs.build.user.name ];
 
   boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
 
diff --git a/makefu/2configs/minimal.nix b/makefu/2configs/minimal.nix
index 1761f65e2..0334422c8 100644
--- a/makefu/2configs/minimal.nix
+++ b/makefu/2configs/minimal.nix
@@ -8,13 +8,13 @@
   time.timeZone = "Europe/Berlin";
 
   networking.hostName = lib.mkIf (lib.hasAttr "host" config.krebs.build) config.krebs.build.host.name;
-  nix.buildCores = 0; # until https://github.com/NixOS/nixpkgs/pull/50440 is in stable
 
   # we use gpg if necessary (or nothing at all)
   programs.ssh.startAgent = false;
 
   # all boxes look the same
-  nix.useSandbox = true;
+  nix.settings.sandbox = true;
+  nix.settings.cores = 0; # until https://github.com/NixOS/nixpkgs/pull/50440 is in stable
   # we configure users via nix
   users.mutableUsers = false;