remote building off

This commit is contained in:
2026-10-04 18:34:39 +03:00
parent cc20ee637d
commit b88c8ebce0
2 changed files with 60 additions and 41 deletions
+50 -40
View File
@@ -73,46 +73,56 @@
# `proxyCommand` is what marks this builder as needing the SSH matchBlock # `proxyCommand` is what marks this builder as needing the SSH matchBlock
# (see modules/server/builder.nix). A builder reachable directly would # (see modules/server/builder.nix). A builder reachable directly would
# omit it. # omit it.
host.builder.clients = [ #
{ # ---- DISABLED 2026-10-04 ----
hostName = "vetymae-nix"; # Remote building temporarily turned off coordinator-side. `host.builder.clients`
sshUser = "oqyude"; # falls back to its default `[]` (declared in modules/options.nix), so
sshKey = "/root/.ssh/id_ed25519"; # modules/server/builder.nix's `lib.mkIf (clients != [])` never fires and no
# NixOS calls this `systems` (plural), not `systemTypes`. The # buildMachines / SSH blocks / distributedBuilds override get generated.
# default is empty — every derivation is rejected. The WSL NixOS # All builds run locally on sapphira's 2 cores. Re-enable by removing the
# runs on x86_64-linux, matching sapphira. # Nix comments on the block below (and on `host.builder.enable = true;`
systems = [ "x86_64-linux" ]; # in configurations/wsl.nix).
# vetymae-nix drops kvm + nixos-test from its advertised #
# system-features (see modules/wsl/builder.nix). Listing them here # host.builder.clients = [
# would not break anything (Nix intersects), but listing the # {
# features the WSL actually has is the documented contract. # hostName = "vetymae-nix";
supportedFeatures = [ # sshUser = "oqyude";
"benchmark" # sshKey = "/root/.ssh/id_ed25519";
"big-parallel" # # NixOS calls this `systems` (plural), not `systemTypes`. The
]; # # default is empty — every derivation is rejected. The WSL NixOS
mandatoryFeatures = [ ]; # # runs on x86_64-linux, matching sapphira.
maxJobs = 24; # systems = [ "x86_64-linux" ];
speedFactor = 0.5; # # vetymae-nix drops kvm + nixos-test from its advertised
# Keep the SSH session alive across many small builds in one daemon # # system-features (see modules/wsl/builder.nix). Listing them here
# session — compile-heavy workloads spam the daemon with hundreds of # # would not break anything (Nix intersects), but listing the
# derivations and ControlMaster collapses those into one Windows hop. # # features the WSL actually has is the documented contract.
# NB: `nix.buildMachines` has no `sshOptions` attribute, so the # supportedFeatures = [
# ControlMaster directive lives in the SSH matchBlock instead (see # "benchmark"
# modules/server/builder.nix). # "big-parallel"
# # ];
# The OpenSSH alias for this host (matches the user's # mandatoryFeatures = [ ];
# ~/.ssh/config so known_hosts entries do not collide with the # maxJobs = 24;
# Windows OpenSSH entry on 127.0.0.1/vetymae) is consumed only by # speedFactor = 0.5;
# the SSH matchBlock below — not by `nix.buildMachines`, which has # # Keep the SSH session alive across many small builds in one daemon
# no such attribute. # # session — compile-heavy workloads spam the daemon with hundreds of
hostKeyAlias = "wsl-nixos-on-vetymae"; # # derivations and ControlMaster collapses those into one Windows hop.
# Use the Windows host's IP directly so the nix-daemon (running as # # NB: `nix.buildMachines` has no `sshOptions` attribute, so the
# root, without the user's ~/.ssh/config) does not need a separate # # ControlMaster directive lives in the SSH matchBlock instead (see
# `vetymae` host alias. With StrictHostKeyChecking=accept-new the # # modules/server/builder.nix).
# first connection adds the Windows host key to /root/.ssh/known_hosts. # #
proxyCommand = "ssh oqyude@192.168.1.100 'wsl -d NixOS -- nc 127.0.0.1 22'"; # # The OpenSSH alias for this host (matches the user's
} # # ~/.ssh/config so known_hosts entries do not collide with the
]; # # Windows OpenSSH entry on 127.0.0.1/vetymae) is consumed only by
# # the SSH matchBlock below — not by `nix.buildMachines`, which has
# # no such attribute.
# hostKeyAlias = "wsl-nixos-on-vetymae";
# # Use the Windows host's IP directly so the nix-daemon (running as
# # root, without the user's ~/.ssh/config) does not need a separate
# # `vetymae` host alias. With StrictHostKeyChecking=accept-new the
# # first connection adds the Windows host key to /root/.ssh/known_hosts.
# proxyCommand = "ssh oqyude@192.168.1.100 'wsl -d NixOS -- nc 127.0.0.1 22'";
# }
# ];
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;
+10 -1
View File
@@ -45,7 +45,16 @@
# cores, the bottleneck host). All builder wiring — fixing the # cores, the bottleneck host). All builder wiring — fixing the
# `system-features` to drop the unsupported `kvm`, and adding the SSH # `system-features` to drop the unsupported `kvm`, and adding the SSH
# user `oqyude` to trusted-users — lives in modules/wsl/builder.nix. # user `oqyude` to trusted-users — lives in modules/wsl/builder.nix.
host.builder.enable = true; #
# ---- DISABLED 2026-10-04 ----
# Remote building temporarily turned off builder-side. The default of
# `host.builder.enable` is `false` (modules/options.nix), so
# modules/wsl/builder.nix's `lib.mkIf enable` block is skipped: WSL
# keeps its default system-features and trusted-users, and no SSH-side
# state changes. Re-enable by uncommenting the assignment below and
# removing the DISABLED banner in configurations/server.nix.
#
# host.builder.enable = true;
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }