diff --git a/common/default.nix b/common/default.nix
index 1224734..659086b 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -14,22 +14,22 @@
   ];
 
   nix = {
-    autoOptimiseStore = true;
-    useSandbox = true;
     package = pkgs.nixFlakes;
-
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
 
-    binaryCaches =
-      [ "https://xe.cachix.org" "https://nix-community.cachix.org" ];
-    binaryCachePublicKeys = [
-      "xe.cachix.org-1:kT/2G09KzMvQf64WrPBDcNWTKsA79h7+y2Fn2N7Xk2Y="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-
-    trustedUsers = [ "root" "cadey" ];
+    settings = {
+      auto-optimise-store = true;
+      sandbox = true;
+      substituters =
+        [ "https://xe.cachix.org" "https://nix-community.cachix.org" ];
+      trusted-users = [ "root" "cadey" ];
+      trusted-public-keys = [
+        "xe.cachix.org-1:kT/2G09KzMvQf64WrPBDcNWTKsA79h7+y2Fn2N7Xk2Y="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
+    };
   };
 
   security.pam.loginLimits = [{