From 1b07c7f93a66daf6e4d09d3eaf341a8e668eb457 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Wed, 29 Dec 2021 12:08:58 -0600 Subject: [PATCH] Revert "use linuxkit (eventually)" This reverts commit 8b6c6307f993f9b271d7cbb9b02d5f1a2404118d. --- machines/sequoia/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/machines/sequoia/default.nix b/machines/sequoia/default.nix index f3b0922..35dd76c 100644 --- a/machines/sequoia/default.nix +++ b/machines/sequoia/default.nix @@ -29,18 +29,24 @@ nix.buildCores = 20; users.nix.configureBuildUsers = true; - # note: needs github.com/nix-community/linuxkit-nix installed before this will work + # use nixbuild.net for distributed builds nix.distributedBuilds = true; nix.buildMachines = [{ - hostName = "ssh://nix-linuxkit"; + hostName = "eu.nixbuild.net"; system = "x86_64-linux"; - sshKey = "/Users/brianhicks/.cache/nix-linuxkit-builder/keys/client"; - maxJobs = 20; - supportedFeatures = [ "benchmark" "big-parallel" "kvm" ]; + maxJobs = 100; + supportedFeatures = [ "benchmark" "big-parallel" ]; }]; nix.extraOptions = '' builders-use-substitutes = true ''; + programs.ssh.knownHosts = { + nixBuild = { + hostNames = [ "eu.nixbuild.net" ]; + publicKey = + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM"; + }; + }; # dotfiles home-manager = {