From 360f67cfab643107c8bb301a8f5c28053665829f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Thu, 25 Sep 2025 17:10:10 +0200 Subject: [PATCH] Use hut substituter in all nodes Reviewed-by: Rodrigo Arias Mallo --- m/apex/configuration.nix | 7 +------ m/bay/configuration.nix | 1 + m/eudy/configuration.nix | 1 + m/fox/configuration.nix | 7 +------ m/lake2/configuration.nix | 1 + m/raccoon/configuration.nix | 6 +----- m/tent/configuration.nix | 1 + m/weasel/configuration.nix | 1 + 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/m/apex/configuration.nix b/m/apex/configuration.nix index 82d3842..6b1073b 100644 --- a/m/apex/configuration.nix +++ b/m/apex/configuration.nix @@ -5,6 +5,7 @@ ../common/xeon.nix ../common/ssf/hosts.nix ../module/ceph.nix + ../module/hut-substituter.nix ../module/slurm-server.nix ./nfs.nix ./wireguard.nix @@ -65,10 +66,4 @@ iptables -I nixos-fw 2 -p tcp -s 84.88.52.176 -j nixos-fw-refuse ''; }; - - # Use tent for cache - nix.settings = { - extra-substituters = [ "https://jungle.bsc.es/cache" ]; - extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; - }; } diff --git a/m/bay/configuration.nix b/m/bay/configuration.nix index 5c6f93c..47e8264 100644 --- a/m/bay/configuration.nix +++ b/m/bay/configuration.nix @@ -3,6 +3,7 @@ { imports = [ ../common/ssf.nix + ../module/hut-substituter.nix ../module/monitoring.nix ]; diff --git a/m/eudy/configuration.nix b/m/eudy/configuration.nix index d676135..ddb894e 100644 --- a/m/eudy/configuration.nix +++ b/m/eudy/configuration.nix @@ -9,6 +9,7 @@ ./cpufreq.nix ./fs.nix ./users.nix + ../module/hut-substituter.nix ../module/debuginfod.nix ]; diff --git a/m/fox/configuration.nix b/m/fox/configuration.nix index e890ba5..8c381f8 100644 --- a/m/fox/configuration.nix +++ b/m/fox/configuration.nix @@ -8,6 +8,7 @@ ../module/emulation.nix ../module/nvidia.nix ../module/slurm-client.nix + ../module/hut-substituter.nix ./wireguard.nix ]; @@ -62,12 +63,6 @@ interfaces.enp1s0f0np0.useDHCP = true; }; - # Use hut for cache - nix.settings = { - extra-substituters = [ "https://jungle.bsc.es/cache" ]; - extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; - }; - # Recommended for new graphics cards hardware.nvidia.open = true; diff --git a/m/lake2/configuration.nix b/m/lake2/configuration.nix index e2f350d..a67e5ae 100644 --- a/m/lake2/configuration.nix +++ b/m/lake2/configuration.nix @@ -4,6 +4,7 @@ imports = [ ../common/ssf.nix ../module/monitoring.nix + ../module/hut-substituter.nix ]; boot.loader.grub.device = "/dev/disk/by-id/wwn-0x55cd2e414d53563a"; diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix index b2c59fe..38ce719 100644 --- a/m/raccoon/configuration.nix +++ b/m/raccoon/configuration.nix @@ -9,6 +9,7 @@ ../module/nvidia.nix ../eudy/kernel/perf.nix ./wireguard.nix + ../module/hut-substituter.nix ]; # Don't install Grub on the disk yet @@ -51,11 +52,6 @@ options = [ "nfsvers=3" "rsize=1024" "wsize=1024" "cto" "nofail" ]; }; - nix.settings = { - extra-substituters = [ "https://jungle.bsc.es/cache" ]; - extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; - }; - # Enable performance governor powerManagement.cpuFreqGovernor = "performance"; diff --git a/m/tent/configuration.nix b/m/tent/configuration.nix index 79c9f45..a165b6b 100644 --- a/m/tent/configuration.nix +++ b/m/tent/configuration.nix @@ -15,6 +15,7 @@ ../hut/msmtp.nix ../module/p.nix ../module/vpn-dac.nix + ../module/hut-substituter.nix ]; # Select the this using the ID to avoid mismatches diff --git a/m/weasel/configuration.nix b/m/weasel/configuration.nix index 43ee735..995d0fd 100644 --- a/m/weasel/configuration.nix +++ b/m/weasel/configuration.nix @@ -3,6 +3,7 @@ { imports = [ ../common/ssf.nix + ../module/hut-substituter.nix ]; # Select this using the ID to avoid mismatches