qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

treewide: rationalise distributed builds

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-11-16 01:54:41 +00:00
parent b25aa75d37
commit 05864180db
6 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hosts/kalessin/default.nix
View file

@ -22,12 +22,10 @@ in
qenya.services.remote-builder = { qenya.services.remote-builder = {
enable = true; enable = true;
authorizedKeys.keys = [ authorizedKeys.keys = [
keys.machines.kilgharrah
keys.machines.tohru keys.machines.tohru
keys.machines.yevaud
keys.machines.orm
]; ];
}; };
boot.binfmt.emulatedSystems = [ "x86_64-linux" ];
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }

11
hosts/kilgharrah/default.nix
View file

@ -40,11 +40,12 @@ in
qenya.services.remote-builder = { qenya.services.remote-builder = {
enable = true; enable = true;
authorizedKeys.keys = [ authorizedKeys.keys = [ keys.machines.tohru ];
keys.machines.tohru };
keys.machines.yevaud qenya.services.distributed-builds = {
keys.machines.orm enable = true;
]; keyFile = "/etc/ssh/ssh_host_ed25519_key";
builders = [ "kalessin" ];
}; };
programs.steam.enable = true; programs.steam.enable = true;

6
hosts/orm/default.nix
View file

@ -14,12 +14,6 @@
users.users.qenya.extraGroups = [ "wheel" ]; users.users.qenya.extraGroups = [ "wheel" ];
qenya.base-server.enable = true; qenya.base-server.enable = true;
qenya.services.distributed-builds = {
enable = true;
keyFile = "/etc/ssh/ssh_host_ed25519_key";
builders = [ "kalessin" ];
};
randomcat.services.zfs.datasets = { randomcat.services.zfs.datasets = {
"rpool_orm/state" = { mountpoint = "none"; }; "rpool_orm/state" = { mountpoint = "none"; };
"rpool_orm/state/actual" = { mountpoint = "/var/lib/actual"; }; "rpool_orm/state/actual" = { mountpoint = "/var/lib/actual"; };

2
hosts/tohru/default.nix
View file

@ -49,7 +49,7 @@
qenya.services.distributed-builds = { qenya.services.distributed-builds = {
enable = true; enable = true;
keyFile = "/etc/ssh/ssh_host_ed25519_key"; keyFile = "/etc/ssh/ssh_host_ed25519_key";
builders = [ "kalessin" ]; builders = [ "kilgharrah" "kalessin" ];
}; };
programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet programs.evolution.enable = true; # not in home-manager yet; not declaratively configurable yet

6
hosts/yevaud/default.nix
View file

@ -14,12 +14,6 @@
users.users.qenya.extraGroups = [ "wheel" ]; users.users.qenya.extraGroups = [ "wheel" ];
qenya.base-server.enable = true; qenya.base-server.enable = true;
qenya.services.distributed-builds = {
enable = true;
keyFile = "/etc/ssh/ssh_host_ed25519_key";
builders = [ "kalessin" ];
};
services.bind = { services.bind = {
# enable = true; # enable = true;
cacheNetworks = [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ]; cacheNetworks = [ "10.127.0.0/16" "fd70:81ca:0f8f::/48" ];

13
services/distributed-builds.nix
View file

@ -38,8 +38,17 @@ in
hostName = config.birdsong.hosts."kalessin".ipv4; hostName = config.birdsong.hosts."kalessin".ipv4;
sshUser = "remotebuild"; sshUser = "remotebuild";
sshKey = cfg.keyFile; sshKey = cfg.keyFile;
systems = [ "aarch64-linux" "x86_64-linux" ]; systems = [ "aarch64-linux" ];
supportedFeatures = [ ]; maxJobs = 2;
supportedFeatures = [ "big-parallel" ];
})
++ (optional (elem "kilgharrah" cfg.builders) {
hostName = config.birdsong.hosts."kilgharrah".ipv4;
sshUser = "remotebuild";
sshKey = cfg.keyFile;
systems = [ "x86_64-linux" ];
maxJobs = 12;
supportedFeatures = [ "big-parallel" ];
}); });
}; };
} }