From cfb0461ab2f5c59b1f9e03c72d1af82223c3c039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleix=20Bon=C3=A9?= Date: Tue, 3 Jun 2025 17:59:17 +0200 Subject: [PATCH] Use `extra-` for substituters and trusted-public-keys From the nix manual: A configuration setting usually overrides any previous value. However, for settings that take a list of items, you can prefix the name of the setting by extra- to append to the previous value. --- m/module/hut-substituter.nix | 4 ++-- m/raccoon/configuration.nix | 4 ++-- web/content/hut/_index.md | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/m/module/hut-substituter.nix b/m/module/hut-substituter.nix index 9b871f6..8d27a45 100644 --- a/m/module/hut-substituter.nix +++ b/m/module/hut-substituter.nix @@ -4,7 +4,7 @@ # Don't add hut as a cache to itself assert config.networking.hostName != "hut"; { - substituters = [ "http://hut/cache" ]; - trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; + extra-substituters = [ "http://hut/cache" ]; + extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; }; } diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix index 2482a16..28d4da8 100644 --- a/m/raccoon/configuration.nix +++ b/m/raccoon/configuration.nix @@ -29,8 +29,8 @@ }; nix.settings = { - substituters = [ "https://jungle.bsc.es/cache" ]; - trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; + extra-substituters = [ "https://jungle.bsc.es/cache" ]; + extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; }; # Enable performance governor diff --git a/web/content/hut/_index.md b/web/content/hut/_index.md index 9f32dc8..9ef8427 100644 --- a/web/content/hut/_index.md +++ b/web/content/hut/_index.md @@ -38,8 +38,8 @@ enable it for all builds in the system. ```nix { ... }: { nix.settings = { - substituters = [ "https://jungle.bsc.es/cache" ]; - trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; + extra-substituters = [ "https://jungle.bsc.es/cache" ]; + extra-trusted-public-keys = [ "jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" ]; }; } ``` @@ -60,8 +60,8 @@ Note: you'll have to be a trusted user. If using nix outside of NixOS, you'll have to update `/etc/nix/nix.conf` ``` -# echo "substituters = https://jungle.bsc.es/cache" >> /etc/nix/nix.conf -# echo "trusted-public-keys = jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" >> /etc/nix/nix.conf +# echo "extra-substituters = https://jungle.bsc.es/cache" >> /etc/nix/nix.conf +# echo "extra-trusted-public-keys = jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=" >> /etc/nix/nix.conf ``` ### Hint in flakes