From 1c3346049508ca830cd73be9eedb7dc5227d6368 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 17 Dec 2024 14:48:19 +1100 Subject: [PATCH] 30 papercuts --- CHANGELOG.md | 1 + flake.lock | 20 ++++++++++---------- hosts/hermes/darwin-configuration.nix | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d320df..f2fdc9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Use `clan.lol` as a remote builder for `hermes-macos` - Added `phi-nixos` to `clan` - Changed `nixpkgs.hostPlatform` to be automatically set by `mkConfiguration` rather than `hardware-configuration.nix` and passed as `system` to `nixpkgs.lib.nixosSystem` - Changed `no-ifd` patch to change `hosts/hermes/hardware-configuration.nix` instead of `flake.nix` to reduce churn diff --git a/flake.lock b/flake.lock index 3d5f551..9f0f7d9 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1733814332, - "narHash": "sha256-7N2Y1m9qvKhpVGXOpCaVhhl/Ip3z6VfRPIdAQrKogaY=", + "lastModified": 1734738425, + "narHash": "sha256-HKXurpl5W9EItFJwxtmIjAqceJL4eJNq4UAe6+76NmE=", "ref": "refs/heads/main", - "rev": "8d505f6ee5bec721693106e57c32b9e31a7a3dfd", - "revCount": 5110, + "rev": "e8c157a512f9516de221f414ff57f685c5ada25f", + "revCount": 5279, "type": "git", "url": "https://git.clan.lol/clan/clan-core" }, @@ -475,11 +475,11 @@ }, "nixos-facter-modules": { "locked": { - "lastModified": 1732288619, - "narHash": "sha256-zSQ2cR+NRJfHUVfkv+O6Wi53wXfzX8KHiO8fRfnvc0M=", + "lastModified": 1734596637, + "narHash": "sha256-MRqwVAe3gsb88u4ME1UidmZFVCx+FEnoob0zkpO9DMY=", "owner": "numtide", "repo": "nixos-facter-modules", - "rev": "862648589993a96480c2255197a28feea712f68f", + "rev": "536472754982bf03079b4b4e0261838a760587c0", "type": "github" }, "original": { @@ -576,11 +576,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733965552, + "narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004", "type": "github" }, "original": { diff --git a/hosts/hermes/darwin-configuration.nix b/hosts/hermes/darwin-configuration.nix index 16546a7..29a4a48 100644 --- a/hosts/hermes/darwin-configuration.nix +++ b/hosts/hermes/darwin-configuration.nix @@ -36,5 +36,19 @@ nix.linux-builder.config.virtualisation.darwin-builder.diskSize = 50 * 1024; # 50 GiB + nix.distributedBuilds = true; + + nix.buildMachines = [{ + # Use ssh-ng for trustless remote building of input-addressed derivations + # i.e. not requiring remote user to be a trusted-user + protocol = "ssh-ng"; + hostName = "clan.lol"; + sshUser = "enzime"; + sshKey = "/etc/ssh/ssh_host_ed25519_key"; + system = "x86_64-linux"; + supportedFeatures = [ "kvm" "benchmark" "big-parallel" ]; + maxJobs = 96; + }]; + system.stateVersion = 5; }