diff options
| author | Mel <mel@rnrd.eu> | 2025-02-14 02:30:24 +0100 |
|---|---|---|
| committer | Mel <mel@rnrd.eu> | 2025-02-14 02:34:03 +0100 |
| commit | 527c450a1e6de00c9c8a77d1251a8a626e6bd732 (patch) | |
| tree | cb1ec51ccdd88a9ce53b283760e48746af385edd | |
| parent | 7b2085eecfcbbfca6804b7e9449b603f2699c1ea (diff) | |
| download | minerals-527c450a1e6de00c9c8a77d1251a8a626e6bd732.tar.zst minerals-527c450a1e6de00c9c8a77d1251a8a626e6bd732.zip | |
Finally re-add the bismuth cache back to our machines
Signed-off-by: Mel <mel@rnrd.eu>
| -rw-r--r-- | modules/nix.nix | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/modules/nix.nix b/modules/nix.nix index bfe09ff..a96813b 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -5,6 +5,14 @@ ... }: +let + inherit (lib) mkIf mkMerge; + + bismuthCache = { + substituters = [ "http://bismuth.serval-moth.ts.net:3000" ]; + trusted-public-keys = [ "bismuth-1:Fkyzfd9gfMUVKq/KfNClHaB2rUiAGtXTzYu96oZteKQ=" ]; + }; +in { nix = { # add compat scripts to the environment, @@ -14,21 +22,24 @@ "nixos-config=${self}/compat/nixos" ]; - settings = { - experimental-features = [ - "flakes" - "nix-command" - ]; - trusted-users = [ - "mel" - ]; - # usually my builders have faster connections - builders-use-substitutes = true; - # don't wait too long on caches that are down - connect-timeout = 3; - # yes nix, i know my flake is dirty!!! - warn-dirty = false; - }; + settings = mkMerge [ + { + experimental-features = [ + "flakes" + "nix-command" + ]; + trusted-users = [ + "mel" + ]; + # usually my builders have faster connections + builders-use-substitutes = true; + # don't wait too long on caches that are down + connect-timeout = 3; + # yes nix, i know my flake is dirty!!! + warn-dirty = false; + } + (mkIf (me != "bismuth") bismuthCache) + ]; distributedBuilds = true; buildMachines = |