moritz/clan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: eval error

Browse source
This commit is contained in:
Moritz Böhme 2025-04-19 16:48:45 +02:00
parent 2a1262df2f
commit f761ede7ff
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
1 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

65
modules/remote_builders.nix
View file

@ -11,48 +11,46 @@
mkEnableOption
mkIf
mapAttrsToList
attrNames
map
concatLines
mkOption
types
;
cfg = config.our.buildMachines;
others = filterAttrs (n: _v: n != config.networking.hostName) self.nixosConfigurations;
builders = filterAttrs (_n: v: v.config.our.buildMachines.enable) self.nixosConfigurations;
others = filterAttrs (n: _v: n != config.networking.hostName) builders;
mkBuilder = hostName: attrs: let
config' = attrs.config;
cfg' = config'.our.buildMachines;
pkgs' = attrs.pkgs;
in
mkIf cfg'.enable {
# NOTE: https://github.com/NixOS/nix/issues/3177
hostName =
if hostName == config.networking.hostName
then "local?root=/nix/store"
else hostName;
sshUser =
if hostName == config.networking.hostName
then null
else "remotebuild";
# CPU architecture of the builder, and the operating system it runs.
# If your builder supports multiple architectures
# (e.g. search for "binfmt" for emulation),
systems = [pkgs'.system] ++ config'.boot.binfmt.emulatedSystems;
# Nix custom ssh-variant that avoids lots of "trusted-users" settings pain
protocol =
if hostName == config.networking.hostName
then null
else "ssh-ng";
# default is 1 but may keep the builder idle in between builds
maxJobs = 3;
speedFactor = 1;
supportedFeatures = cfg'.supportedFeatures;
mandatoryFeatures = [];
};
in {
# NOTE: https://github.com/NixOS/nix/issues/3177
hostName =
if hostName == config.networking.hostName
then "local?root=/nix/store"
else hostName;
sshUser =
if hostName == config.networking.hostName
then null
else "remotebuild";
# CPU architecture of the builder, and the operating system it runs.
# If your builder supports multiple architectures
# (e.g. search for "binfmt" for emulation),
systems = [pkgs'.system] ++ config'.boot.binfmt.emulatedSystems;
# Nix custom ssh-variant that avoids lots of "trusted-users" settings pain
protocol =
if hostName == config.networking.hostName
then null
else "ssh-ng";
# default is 1 but may keep the builder idle in between builds
maxJobs = 3;
speedFactor = 1;
supportedFeatures = cfg'.supportedFeatures;
mandatoryFeatures = [];
};
buildMachines = mapAttrsToList mkBuilder self.nixosConfigurations;
buildMachines = mapAttrsToList mkBuilder builders;
remotebuildKeys =
mapAttrsToList (
@ -60,12 +58,11 @@
)
others;
mkMatch = host: ''
Match User remotebuild Host ${host}
mkMatch = hostName: _v: ''
Match User remotebuild Host ${hostName}
IdentityFile ${config.clan.core.vars.generators.remotebuild.files."ssh.id_ed25519".path}
'';
othersName = attrNames others;
sshConfig = concatLines (map mkMatch othersName);
sshConfig = concatLines (mapAttrsToList mkMatch others);
in {
options.our.buildMachines = {
enable = mkEnableOption "Use this machine as a remoteBuilder for others and vice versa.";