1 files changed, 23 insertions, 29 deletions
diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix
index 6b6d51b3..6e3cb061 100644
--- a/system/settings/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
@@ -1,41 +1,35 @@
 { config
+, lib
 , pkgs
 , ...
 }: {
-  imports = [
-    ../../../pin.nix
-  ];
+  imports = [ ../pin.nix ];
   nix = {
     settings = {
-      cores = 0;
-      auto-optimise-store = true;
-    };
-
-    daemonCPUSchedPolicy = "idle";
-    daemonIOSchedClass = "idle";
+      cores = lib.mkDefault 0;
+      use-xdg-base-directories = true;
+      keep-outputs = true;
+      keep-derivations = true;
+      experimental-features = "nix-command flakes";
+      warn-dirty = false;
+      substituters = [
+        "https://nix-community.cachix.org"
+        "https://deploy-rs.cachix.org"
+        "https://binarycache.alanpearce.eu"
+        "https://deploy-rs.cachix.org"
+      ];
 
-    extraOptions = ''
-      keep-outputs = true
-      keep-derivations = true
-      experimental-features = nix-command flakes
-      warn-dirty = false
-    '';
+      trusted-public-keys = [
+        "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "deploy-rs.cachix.org-1:xfNobmiwF/vzvK1gpfediPwpdIP0rpDV2rYqx40zdSI="
+        "binarycache.alanpearce.eu:ZwqO3XMuajPictjwih8OY2+RXnOKpjZEZFHJjGSxAI4="
+      ];
+    };
 
     gc = {
-      automatic = true;
-      options = "--delete-older-than 14d";
+      automatic = lib.mkDefault true;
+      options = lib.mkDefault "--delete-older-than 14d";
     };
   };
-
-  system.autoUpgrade = {
-    enable = true;
-    flags = [ "--max-jobs" "2" ];
-    flake = "/home/alan/projects/alanpearce/nixfiles";
-  };
-  systemd.services.nixos-upgrade = {
-    script = pkgs.lib.mkForce ''
-      ${pkgs.nix}/bin/nix-channel --update
-      ${config.system.build.nixos-rebuild}/bin/nixos-rebuild boot --no-build-output ${toString config.system.autoUpgrade.flags}
-    '';
-  };
 }