4 files changed, 5 insertions, 20 deletions
diff --git a/machines/sternenseemann/fliewatuet.nix b/machines/sternenseemann/fliewatuet.nix
index 61c8472c..b04f4dc8 100644
--- a/machines/sternenseemann/fliewatuet.nix
+++ b/machines/sternenseemann/fliewatuet.nix
@@ -29,13 +29,6 @@ in {
   swapDevices = [ ];
 
   nix.maxJobs = 8;
-  nix.binaryCaches = [
-    "https://headcounter.org/hydra/"
-    "https://cache.nixos.org/"
-  ];
-  nix.binaryCachePublicKeys = [
-    "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
-  ];
   nix.useSandbox = true;
   nix.extraOptions = "gc-keep-derivations = false";
 
diff --git a/machines/sternenseemann/schaf.nix b/machines/sternenseemann/schaf.nix
index f63fd559..3fa7da00 100644
--- a/machines/sternenseemann/schaf.nix
+++ b/machines/sternenseemann/schaf.nix
@@ -7,13 +7,9 @@
 
   services.nixosManual.enable = false;
 
-  nix.binaryCaches = [ 
-    "https://headcounter.org/hydra/"
-    "http://nixos-arm.dezgeg.me/channel"
-  ];
+  nix.binaryCaches = [ "http://nixos-arm.dezgeg.me/channel" ];
 
   nix.binaryCachePublicKeys = [
-    "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
     "nixos-arm.dezgeg.me-1:xBaUKS3n17BZPKeyxL4JfbTqECsT+ysbDJz29kLFRW0=%"
   ];
 
diff --git a/machines/sternenseemann/schnurrkadse.nix b/machines/sternenseemann/schnurrkadse.nix
index ef1ceeac..93500eac 100644
--- a/machines/sternenseemann/schnurrkadse.nix
+++ b/machines/sternenseemann/schnurrkadse.nix
@@ -27,13 +27,6 @@ in {
   swapDevices = [ { device = "/dev/mapper/schnurrkadse-swap"; } ];
 
   nix.maxJobs = 1;
-  nix.binaryCaches = [
-    "https://headcounter.org/hydra/"
-    "https://cache.nixos.org/"
-  ];
-  nix.binaryCachePublicKeys = [
-    "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
-  ];
 
   hardware.pulseaudio.enable = true;
 
diff --git a/modules/core/common.nix b/modules/core/common.nix
index a6a491b4..0a8e696c 100644
--- a/modules/core/common.nix
+++ b/modules/core/common.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, options, pkgs, lib, ... }:
 
 with lib;
 
@@ -48,6 +48,9 @@ with lib;
       }) vuizvui;
     };
 
+    nix.binaryCaches = options.nix.binaryCaches.default ++ [
+      "https://headcounter.org/hydra/"
+    ];
     nix.binaryCachePublicKeys = [
       "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
     ];