harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(nixbuild): centralize distributed build config

Browse source 
- Moved shared distributed build settings to `nixbuild.nix` for reuse.
- Updated `m4` and `rialo` systems to import the centralized configuration.
- Simplifies maintenance and ensures consistency across systems.
This commit is contained in:
Harald Hoyer 2025-11-13 10:27:54 +01:00
parent 143e8cbf98
commit 3f6c1df78c
3 changed files with 64 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

39
systems/aarch64-darwin/m4/default.nix
View file

@ -4,45 +4,10 @@ with lib.metacfg;
{ {
system.defaults.dock.autohide = false; system.defaults.dock.autohide = false;
nix.distributedBuilds = true; imports = [
./../../nixbuild.nix
nix.buildMachines = [
{
hostName = "m1.local";
system = "aarch64-darwin";
maxJobs = 4;
speedFactor = 2;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "rialo.local";
system = "aarch64-darwin";
maxJobs = 4;
speedFactor = 2;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "sgx.local";
system = "x86_64-linux";
maxJobs = 4;
speedFactor = 1;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
]; ];
nix.settings = {
substituters = [
"https://cache.nixos.org"
"ssh-ng://harald@m4.local?ssh-key=/etc/ssh/nix-builder-key"
"ssh-ng://harald@rialo.local?ssh-key=/etc/ssh/nix-builder-key"
];
builders-use-substitutes = true;
};
homebrew = { homebrew = {
enable = true; enable = true;
brews = [ brews = [

42
systems/aarch64-darwin/rialo/default.nix
View file

@ -2,48 +2,10 @@
with lib.metacfg; with lib.metacfg;
{ {
imports = [
./../../nixbuild.nix
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "m1.local";
system = "aarch64-darwin";
maxJobs = 4;
speedFactor = 2;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "rialo.local";
system = "aarch64-darwin";
maxJobs = 4;
speedFactor = 2;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "sgx.local";
system = "x86_64-linux";
maxJobs = 4;
speedFactor = 1;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
]; ];
nix.settings = {
substituters = [
"https://cache.nixos.org"
"ssh-ng://harald@m4.local?ssh-key=/etc/ssh/nix-builder-key"
"ssh-ng://harald@rialo.local?ssh-key=/etc/ssh/nix-builder-key"
];
builders-use-substitutes = true;
};
homebrew = { homebrew = {
enable = true; enable = true;
brews = [ brews = [

60
systems/nixbuild.nix Normal file
View file

@ -0,0 +1,60 @@
{ lib, pkgs, ... }:
with lib.metacfg;
{
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "m4";
system = "aarch64-darwin";
maxJobs = 4;
speedFactor = 3;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "rialo";
system = "aarch64-darwin";
maxJobs = 4;
speedFactor = 3;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "sgx";
system = "x86_64-linux";
maxJobs = 4;
speedFactor = 1;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "sgx";
system = "x86_64-linux";
maxJobs = 4;
speedFactor = 1;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
{
hostName = "sgx";
system = "x86_64-linux";
maxJobs = 4;
speedFactor = 1;
sshUser = "harald";
sshKey = "/etc/ssh/nix-builder-key";
}
];
nix.settings = {
substituters = [
"https://cache.nixos.org"
"ssh-ng://harald@m4?ssh-key=/etc/ssh/nix-builder-key"
"ssh-ng://harald@rialo?ssh-key=/etc/ssh/nix-builder-key"
"ssh-ng://harald@sgx?ssh-key=/etc/ssh/nix-builder-key"
];
builders-use-substitutes = true;
};
}