feat: Move binary cache configs to new shared lib

lpchaim · Jul 2, 2024 · fbbd6b9 · fbbd6b9
1 parent c684e07
commit fbbd6b9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/lib/shared/default.nix b/lib/shared/default.nix
@@ -0,0 +1,17 @@
+{
+  shared = {
+    nix.settings = {
+      keep-outputs = true;
+      substituters = [
+        "https://nix-community.cachix.org"
+        "https://nyx.chaotic.cx"
+        "https://snowflakeos.cachix.org"
+      ];
+      trusted-public-keys = [
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+        "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8"
+        "snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
+      ];
+    };
+  };
+}
diff --git a/modules/home/base/default.nix b/modules/home/base/default.nix
@@ -2,6 +2,7 @@
 
 with lib;
 let
+  inherit (lib.lpchaim) shared;
   namespace = [ "my" "modules" ];
   cfg = getAttrFromPath namespace config;
 in
@@ -22,5 +23,6 @@ in
       gui.enable = mkDefault false;
     };
     programs.home-manager.enable = mkDefault true;
+    nix.settings = shared.nix.settings;
   };
 }
diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix
@@ -12,6 +12,7 @@
 
 let
   inherit (lib) mkDefault;
+  inherit (lib.lpchaim) shared;
   getFileSystemsByFsType = fsType:
     lib.filterAttrs (_: fs: fs.fsType == fsType) config.fileSystems;
 in
@@ -46,19 +47,7 @@ in
     extraOptions = ''
       experimental-features = flakes nix-command
     '';
-    settings = {
-      keep-outputs = true;
-      substituters = [
-        "https://nix-community.cachix.org"
-        "https://nyx.chaotic.cx"
-        "https://snowflakeos.cachix.org"
-      ];
-      trusted-public-keys = [
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8"
-        "snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70="
-      ];
-    };
+    settings = shared.nix.settings;
     gc = {
       automatic = true;
       dates = "weekly";