2 files changed, 15 insertions, 13 deletions
diff --git a/users/grfn/system/system/modules/common.nix b/users/grfn/system/system/modules/common.nix
index 635747d118ff..a7d5a62e686c 100644
--- a/users/grfn/system/system/modules/common.nix
+++ b/users/grfn/system/system/modules/common.nix
@@ -61,7 +61,7 @@ with lib;
   };
 
   nix = {
-    trustedUsers = [ "grfn" ];
+    settings.trusted-users = [ "grfn" ];
     distributedBuilds = true;
 
     gc = {
diff --git a/users/grfn/system/system/modules/tvl.nix b/users/grfn/system/system/modules/tvl.nix
index 959f8449f659..3c0326c66412 100644
--- a/users/grfn/system/system/modules/tvl.nix
+++ b/users/grfn/system/system/modules/tvl.nix
@@ -15,21 +15,23 @@
       builders-use-substitutes = true
     '';
 
-    binaryCaches = [
-      "https://cache.nixos.org"
-      "ssh://nix-ssh@whitby.tvl.fyi"
-    ];
-    trustedBinaryCaches = [
-      "https://cache.nixos.org"
-      "ssh://nix-ssh@whitby.tvl.fyi"
-    ];
-    binaryCachePublicKeys = [
-      "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc="
-    ];
+    settings = {
+      substituters = [
+        "https://cache.nixos.org"
+        "ssh://nix-ssh@whitby.tvl.fyi"
+      ];
+      trusted-substituters = [
+        "https://cache.nixos.org"
+        "ssh://nix-ssh@whitby.tvl.fyi"
+      ];
+      trusted-public-keys = [
+        "cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc="
+      ];
+    };
   };
 
   programs.ssh.knownHosts.whitby = {
-    hostNames = [ "whitby" "whitby.tvl.fyi" "49.12.129.211" ];
+    extraHostNames = [ "whitby" "whitby.tvl.fyi" "49.12.129.211" ];
     publicKeyFile = pkgs.writeText "whitby.pub" ''
       ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNh/w4BSKov0jdz3gKBc98tpoLta5bb87fQXWBhAl2I
     '';