summary refs log tree commit diff stats
path: root/system
diff options
context:
space:
mode:
authorAlan Pearce2024-05-18 20:44:02 +0200
committerAlan Pearce2024-05-18 20:44:02 +0200
commitdd2d25b8929750d66345641928aa10f80f40f883 (patch)
tree3c5a2ef3c7be5b79dddf6d00a5c06004748e99a9 /system
parentb25d004e9973bd32ce86bf6c1b94cba5ddfa187c (diff)
downloadnixfiles-dd2d25b8929750d66345641928aa10f80f40f883.tar.lz
nixfiles-dd2d25b8929750d66345641928aa10f80f40f883.tar.zst
nixfiles-dd2d25b8929750d66345641928aa10f80f40f883.zip
move nix cache settings to nix.nix
Diffstat (limited to 'system')
-rw-r--r--system/settings/configuration/nix.nix13
-rw-r--r--system/settings/programs/base.nix15
2 files changed, 13 insertions, 15 deletions
diff --git a/system/settings/configuration/nix.nix b/system/settings/configuration/nix.nix
index 97cd7aeb..6e3cb061 100644
--- a/system/settings/configuration/nix.nix
+++ b/system/settings/configuration/nix.nix
@@ -12,6 +12,19 @@
       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"
+      ];
+
+      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 = {
diff --git a/system/settings/programs/base.nix b/system/settings/programs/base.nix
index bed3fd47..81a71a4b 100644
--- a/system/settings/programs/base.nix
+++ b/system/settings/programs/base.nix
@@ -9,19 +9,4 @@
   ] ++ (lib.optionals (stdenv.isLinux) [
     psmisc
   ]);
-  nix.settings = {
-    substituters = [
-      "https://nix-community.cachix.org"
-      "https://deploy-rs.cachix.org"
-      "https://binarycache.alanpearce.eu"
-      "https://deploy-rs.cachix.org"
-    ];
-
-    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="
-    ];
-  };
 }