diff options
| -rw-r--r-- | hosts/muhammed/configuration.nix | 2 | ||||
| -rw-r--r-- | hosts/muhammed/remote-builders/ahmed-builder.nix | 48 | ||||
| -rw-r--r-- | hosts/muhammed/remote-builders/default.nix | 18 | ||||
| -rw-r--r-- | hosts/muhammed/remote-builders/local-linux-builder.nix (renamed from hosts/muhammed/linux-builder/default.nix) | 3 |
4 files changed, 68 insertions, 3 deletions
diff --git a/hosts/muhammed/configuration.nix b/hosts/muhammed/configuration.nix index dd9a737..2cf8c3f 100644 --- a/hosts/muhammed/configuration.nix +++ b/hosts/muhammed/configuration.nix @@ -7,7 +7,7 @@ }: { imports = [ ./home - ./linux-builder + ./remote-builders ./wraaath-sshfs ]; diff --git a/hosts/muhammed/remote-builders/ahmed-builder.nix b/hosts/muhammed/remote-builders/ahmed-builder.nix new file mode 100644 index 0000000..7b9bd99 --- /dev/null +++ b/hosts/muhammed/remote-builders/ahmed-builder.nix @@ -0,0 +1,48 @@ +# This file registers ahmed as a remote x86_64-linux builder. +# +# You can test that the remote builder is working with this command: +# +# nix build \ +# --max-jobs 0 \ +# --rebuild \ +# --expr 'derivation { name = "hello"; system = "x86_64-linux"; builder = "/bin/sh"; args = [ "-c" "echo hello >$out" ]; }' +# +# See: https://nixos.wiki/wiki/Distributed_build +# See: hosts/ahmed/remote-builder/default.nix +# FIXME: How to trust key ahead of time? +{metadata, ...}: let + inherit (metadata.hosts.ahmed) ipAddress; +in { + nix.buildMachines = [ + { + protocol = "ssh-ng"; + hostName = "ahmed-builder"; + + system = "x86_64-linux"; + maxJobs = 1; + speedFactor = 1; + supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"]; + mandatoryFeatures = []; + } + ]; + + environment.etc."ssh/ssh_config.d/100-ahmed-builder.conf".text = '' + Host ahmed-builder + User remotebuilder + Hostname ${ipAddress} + HostKeyAlias ahmed-builder + # This matches `users.users.<builder>.authorizedKeys` on the server-side. + # HACK: We should use a purpose-specific key. + IdentityFile /Users/linus/.ssh/id_rsa + ''; + + # We have to trust ahmeds public key or the Nix daemon will fail to connect. + programs.ssh.knownHosts = { + ahmed-builder = { + hostNames = ["ahmed-builder"]; + # This is the public key of remotebuilder on the remote machine. + # It was obtained by manually connecting to remotebuilder@${ipAddress} and trusting the key. + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOodiSwTcZcaZxqLyHjI2MGe1CpIBvIzzbjpXrwAyiYO"; + }; + }; +} diff --git a/hosts/muhammed/remote-builders/default.nix b/hosts/muhammed/remote-builders/default.nix new file mode 100644 index 0000000..50bda96 --- /dev/null +++ b/hosts/muhammed/remote-builders/default.nix @@ -0,0 +1,18 @@ +# Manages remote Nix builders. These are useful for building faster and for +# other architectures. +{...}: { + imports = [ + ./local-linux-builder.nix + ./ahmed-builder.nix + ]; + + # Enable using remote builders. + nix.distributedBuilds = true; + + # Optional, useful when the builder has a faster internet connection than + # yours. This may be the case since this host is a laptop and one of the + # remote builders isn't. + nix.extraOptions = '' + builders-use-substitutes = true + ''; +} diff --git a/hosts/muhammed/linux-builder/default.nix b/hosts/muhammed/remote-builders/local-linux-builder.nix index efba173..dba2297 100644 --- a/hosts/muhammed/linux-builder/default.nix +++ b/hosts/muhammed/remote-builders/local-linux-builder.nix @@ -1,8 +1,7 @@ # Create a local Linux builder. This will allow us to build aarch64-linux # targets directly on this machine. -# -# It also does some related stuff to make NixOS tests work. {...}: { + # XXX: Why is this necessary? nix.settings.trusted-users = ["linus"]; nix.linux-builder = { |