From 4ec04097d7720e0f3a772d41d7a6e43285c89265 Mon Sep 17 00:00:00 2001 From: Mel Date: Sun, 13 Jul 2025 03:26:46 +0200 Subject: Remove 'bismuth' cache/builder for moissanite, add lapin as AArch64 builder Signed-off-by: Mel --- modules/nix.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/modules/nix.nix b/modules/nix.nix index 0f4366a..7314733 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -12,6 +12,9 @@ let substituters = [ "http://bismuth.serval-moth.ts.net:3000" ]; trusted-public-keys = [ "bismuth-1:Fkyzfd9gfMUVKq/KfNClHaB2rUiAGtXTzYu96oZteKQ=" ]; }; + + useBismuthCache = false; + # useBismuthCache = me.name != "bismuth"; in { nix = { @@ -38,7 +41,7 @@ in # yes nix, i know my flake is dirty!!! warn-dirty = false; } - (mkIf (me.name != "bismuth") bismuthCache) + (mkIf useBismuthCache bismuthCache) ]; distributedBuilds = true; @@ -48,7 +51,10 @@ in defaults = { sshUser = "mel"; - systems = [ "x86_64-linux" "i686-linux" ]; + systems = [ + "x86_64-linux" + "i686-linux" + ]; supportedFeatures = [ "kvm" "big-parallel" @@ -58,13 +64,6 @@ in }; in lib.filter (m: m.hostName != me.name) [ - { - hostName = tailnet "bismuth"; - maxJobs = 32; - speedFactor = 16; - publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUFRUllWU0tXaDRldDFtNUxsd1RoWTNIeEdTRkM0NDkydmhwaWQ4WTJzcVogcm9vdEBCaXNtdXRoCg=="; - inherit (defaults) sshUser systems supportedFeatures; - } { hostName = tailnet "renard"; maxJobs = 8; @@ -72,6 +71,14 @@ in publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUovcURMNys4NiswSDZOa1BzL3c0R1lpV1F3VC80WUF4OU8ySjdzTGtLbWYgcm9vdEByZW5hcmQK"; inherit (defaults) sshUser systems supportedFeatures; } + { + hostName = tailnet "lapin"; + maxJobs = 4; + speedFactor = 1; + publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUdNRC9FTjl2OFlnSE91NFlHNzRRK3h2d2pDZHhiTUlaam5RY1VYaTBRaFogcm9vdEBsYXBpbgo="; + systems = [ "aarch64-linux" ]; + inherit (defaults) sshUser supportedFeatures; + } ]; }; } -- cgit 1.4.1