fix: reflect renames of Nix configuration options

Change-Id: I7e28ac3d71acd7d99a1d3ef97bef9422097e4abf
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6154
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>

ops/machines/whitby/default.nix

@@ -184,17 +184,17 @@ in
 
   nix = {
     nrBuildUsers = 256;
-    maxJobs = lib.mkDefault 64;
-    extraOptions = ''
-      secret-key-files = /run/agenix/nix-cache-priv
-    '';
+    settings = {
+      max-jobs = lib.mkDefault 64;
+      secret-key-files = "/run/agenix/nix-cache-priv";
 
-    trustedUsers = [
+      trusted-users = [
         "grfn"
         "lukegb"
         "tazjin"
         "sterni"
       ];
+    };
 
     sshServe = {
       enable = true;

ops/modules/tvl-cache.nix

@@ -6,12 +6,12 @@
   };
 
   config = lib.mkIf config.tvl.cache.enable {
-    nix = {
-      binaryCachePublicKeys = [
+    nix.settings = {
+      trusted-public-keys = [
         "cache.tvl.su:kjc6KOMupXc1vHVufJUoDUYeLzbwSr9abcAKdn/U1Jk="
       ];
 
-      binaryCaches = [
+      substituters = [
         "https://cache.tvl.su"
       ];
     };

users/tazjin/nixos/camden/default.nix

@@ -74,16 +74,14 @@ lib.fix (self: {
     };
   };
 
-  nix = {
-    maxJobs = lib.mkDefault 4;
-
-    trustedUsers = [ "root" "tazjin" ];
-
-    binaryCaches = [
+  nix.settings = {
+    max-jobs = lib.mkDefault 4;
+    trusted-users = [ "root" "tazjin" ];
+    substituters = [
       "https://tazjin.cachix.org"
     ];
 
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "tazjin.cachix.org-1:IZkgLeqfOr1kAZjypItHMg1NoBjm4zX9Zzep8oRSh7U="
     ];
   };

users/tazjin/nixos/frog/default.nix

@@ -61,10 +61,10 @@ lib.fix (self: {
     };
   };
 
-  nix = {
-    maxJobs = 48;
-    binaryCaches = [ "ssh://nix-ssh@whitby.tvl.fyi" ];
-    binaryCachePublicKeys = [ "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" ];
+  nix.settings = {
+    max-jobs = 48;
+    substituters = [ "ssh://nix-ssh@whitby.tvl.fyi" ];
+    trusted-public-keys = [ "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc=" ];
   };
 
   networking = {

users/tazjin/nixos/modules/home-config.nix

@@ -12,9 +12,7 @@
     initialHashedPassword = "$2b$05$1eBPdoIgan/C/L8JFqIHBuVscQyTKw1L/4VBlzlLvLBEf6CXS3EW6";
   };
 
-  nix = {
-    trustedUsers = [ "tazjin" ];
-  };
+  nix.settings.trusted-users = [ "tazjin" ];
 
   home-manager.useGlobalPkgs = true;
   home-manager.users.tazjin = depot.users.tazjin.home."${config.networking.hostName}";