From f932d043fd2e54a36d9a5994c4326cff497c7a92 Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Fri, 5 Jul 2024 22:33:27 +0200 Subject: [PATCH] systems: update nix settings --- system/hosts/Styx.nix | 13 +++++++++---- system/hosts/argon.nix | 27 ++++++++++++++------------- system/hosts/mediaserver.nix | 29 +++++++++++++++-------------- system/hosts/neon.nix | 27 ++++++++++++++------------- system/hosts/tanker.nix | 29 +++++++++++++++-------------- 5 files changed, 67 insertions(+), 58 deletions(-) diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix index f5649f2..afd807f 100644 --- a/system/hosts/Styx.nix +++ b/system/hosts/Styx.nix @@ -24,30 +24,35 @@ in experimental-features = [ "nix-command" "flakes" ]; extra-platforms = [ "x86_64-darwin" ]; + log-lines = 25; auto-optimise-store = true; keep-derivations = true; keep-outputs = true; - substituters = [ + builders-use-substitutes = true; + + extra-substituters = [ "https://attic.cache.daniel.sx/nifoc-systems?priority=30" "https://nix-community.cachix.org?priority=50" "https://cache.garnix.io?priority=60" ]; - trusted-substituters = [ + extra-trusted-substituters = [ "https://attic.hosting.nedeco.mobi/devshells" ]; - trusted-public-keys = [ + extra-trusted-public-keys = [ "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - # trusted-substituters + # extra-trusted-substituters "devshells:YXtbU0DheB229oCr2D0H0qHjj2Ed/e2VZiLSXgQ1IVA=" ]; trusted-users = [ "@admin" ]; + + connect-timeout = 5; }; configureBuildUsers = true; diff --git a/system/hosts/argon.nix b/system/hosts/argon.nix index dba69a5..9a6a6df 100644 --- a/system/hosts/argon.nix +++ b/system/hosts/argon.nix @@ -48,16 +48,21 @@ in package = pkgs.nixVersions.stable; settings = { - auto-optimise-store = true; + experimental-features = [ "nix-command" "flakes" ]; - substituters = [ - "https://attic.cache.daniel.sx/nifoc-systems?priority=1" - "https://attic.cache.daniel.sx/nifoc-ci?priority=2" - "https://nix-community.cachix.org?priority=3" - "https://cache.garnix.io?priority=4" + log-lines = 25; + auto-optimise-store = true; + keep-derivations = true; + keep-outputs = true; + + extra-substituters = [ + "https://attic.cache.daniel.sx/nifoc-systems?priority=30" + "https://attic.cache.daniel.sx/nifoc-ci?priority=35" + "https://nix-community.cachix.org?priority=50" + "https://cache.garnix.io?priority=60" ]; - trusted-public-keys = [ + extra-trusted-public-keys = [ "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU=" "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" @@ -68,6 +73,8 @@ in "root" "nix-remote-builder" ]; + + connect-timeout = 5; }; gc = { @@ -75,12 +82,6 @@ in dates = "weekly"; options = "--delete-older-than 14d"; }; - - extraOptions = '' - experimental-features = nix-command flakes - keep-derivations = true - keep-outputs = true - ''; }; environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc; diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix index d96c9cc..9f313de 100644 --- a/system/hosts/mediaserver.nix +++ b/system/hosts/mediaserver.nix @@ -58,16 +58,22 @@ in package = pkgs.nixVersions.stable; settings = { - auto-optimise-store = true; + experimental-features = [ "nix-command" "flakes" ]; + extra-platforms = [ "aarch64-linux" ]; - substituters = [ - "https://attic.cache.daniel.sx/nifoc-systems?priority=1" - "https://attic.cache.daniel.sx/nifoc-ci?priority=2" - "https://nix-community.cachix.org?priority=3" - "https://cache.garnix.io?priority=4" + log-lines = 25; + auto-optimise-store = true; + keep-derivations = true; + keep-outputs = true; + + extra-substituters = [ + "https://attic.cache.daniel.sx/nifoc-systems?priority=30" + "https://attic.cache.daniel.sx/nifoc-ci?priority=35" + "https://nix-community.cachix.org?priority=50" + "https://cache.garnix.io?priority=60" ]; - trusted-public-keys = [ + extra-trusted-public-keys = [ "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU=" "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" @@ -78,6 +84,8 @@ in "root" "nix-remote-builder" ]; + + connect-timeout = 5; }; gc = { @@ -85,13 +93,6 @@ in dates = "weekly"; options = "--delete-older-than 14d"; }; - - extraOptions = '' - experimental-features = nix-command flakes - extra-platforms = aarch64-linux - keep-derivations = true - keep-outputs = true - ''; }; environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc; diff --git a/system/hosts/neon.nix b/system/hosts/neon.nix index 60ce64d..978485a 100644 --- a/system/hosts/neon.nix +++ b/system/hosts/neon.nix @@ -36,21 +36,28 @@ in package = pkgs.nixVersions.stable; settings = { - auto-optimise-store = true; + experimental-features = [ "nix-command" "flakes" ]; - substituters = [ - "https://attic.cache.daniel.sx/nifoc-systems?priority=1" - "https://attic.cache.daniel.sx/nifoc-ci?priority=2" - "https://nix-community.cachix.org?priority=3" - "https://cache.garnix.io?priority=4" + log-lines = 25; + auto-optimise-store = true; + keep-derivations = true; + keep-outputs = true; + + extra-substituters = [ + "https://attic.cache.daniel.sx/nifoc-systems?priority=30" + "https://attic.cache.daniel.sx/nifoc-ci?priority=35" + "https://nix-community.cachix.org?priority=50" + "https://cache.garnix.io?priority=60" ]; - trusted-public-keys = [ + extra-trusted-public-keys = [ "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU=" "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; + + connect-timeout = 5; }; gc = { @@ -58,12 +65,6 @@ in dates = "weekly"; options = "--delete-older-than 14d"; }; - - extraOptions = '' - experimental-features = nix-command flakes - keep-derivations = true - keep-outputs = true - ''; }; environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc; diff --git a/system/hosts/tanker.nix b/system/hosts/tanker.nix index ef3303d..79a7c74 100644 --- a/system/hosts/tanker.nix +++ b/system/hosts/tanker.nix @@ -66,21 +66,29 @@ in package = pkgs.nixVersions.stable; settings = { - auto-optimise-store = true; + experimental-features = [ "nix-command" "flakes" ]; + extra-platforms = [ "aarch64-linux" ]; - substituters = [ - "https://attic.cache.daniel.sx/nifoc-systems?priority=1" - "https://attic.cache.daniel.sx/nifoc-ci?priority=2" - "https://nix-community.cachix.org?priority=3" - "https://cache.garnix.io?priority=4" + log-lines = 25; + auto-optimise-store = true; + keep-derivations = true; + keep-outputs = true; + + extra-substituters = [ + "https://attic.cache.daniel.sx/nifoc-systems?priority=30" + "https://attic.cache.daniel.sx/nifoc-ci?priority=35" + "https://nix-community.cachix.org?priority=50" + "https://cache.garnix.io?priority=60" ]; - trusted-public-keys = [ + extra-trusted-public-keys = [ "nifoc-systems:eDDqVP5BFR6/1KvXbF9oUL8JahDdmbrsYtxlQ57LOTU=" "nifoc-ci:JpD9zqVQi8JuS7B8htPDOQZh08rhInMnGFS9RVhiuwk=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; + + connect-timeout = 5; }; gc = { @@ -88,13 +96,6 @@ in dates = "weekly"; options = "--delete-older-than 14d"; }; - - extraOptions = '' - experimental-features = nix-command flakes - extra-platforms = aarch64-linux - keep-derivations = true - keep-outputs = true - ''; }; boot = {