From b644d7a354abbf2ddd81a1c81c7f3c4a73abb1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sat, 2 May 2020 14:44:15 +0100
Subject: [PATCH] enable distributed builds on new brix

---
 nixos/boxes/foureighty.nix   |  1 +
 nixos/common.nix             |  2 +-
 nixos/distributed-builds.nix | 22 +++++++++++++---------
 nixos/gfx-intel.nix          |  1 -
 nixos/programs/genpass.nix   |  2 +-
 nixos/zerotier.nix           |  2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix
index b63c6690..e742abec 100644
--- a/nixos/boxes/foureighty.nix
+++ b/nixos/boxes/foureighty.nix
@@ -43,6 +43,7 @@
     ../zerotier.nix
     ../i3/system.nix
     ../virtualbox.nix
+    ../distributed-builds.nix
   ];
 
   nix.maxJobs = 2;
diff --git a/nixos/common.nix b/nixos/common.nix
index 35c6d38f..1d3505e7 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -25,7 +25,7 @@ in
       };
 
       environment.systemPackages = with pkgs; [
-        wget git gnupg curl tmux python36Packages.glances htop atop firefox home-manager alacritty pciutils powertop ripgrep-all fd dnsutils
+        wget git gnupg curl tmux glances htop atop firefox home-manager alacritty pciutils powertop ripgrep-all fd dnsutils
       ];
 
       i18n.defaultLocale = "en_GB.UTF-8";
diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix
index 8d718bbe..0badb822 100644
--- a/nixos/distributed-builds.nix
+++ b/nixos/distributed-builds.nix
@@ -1,6 +1,19 @@
 { config, pkgs, ... }:
 {
+  programs.ssh.extraConfig = ''
+    StrictHostKeyChecking=accept-new
+  '';
+
   nix.buildMachines = [
+    {
+      hostName = "brix.lan";
+      sshUser = "nix-builder";
+      sshKey = "/home/cyryl/.ssh/id_ed25519";
+      system = "x86_64-linux";
+      maxJobs = 2;
+      supportedFeatures = [ "kvm" ];
+      mandatoryFeatures = [ ];
+    }
     {
       hostName = "vultr1.local";
       sshUser = "nix-builder";
@@ -10,15 +23,6 @@
       supportedFeatures = [ ];
       mandatoryFeatures = [ ];
     }
-    {
-      hostName = "brix.local";
-      sshUser = "nix-builder";
-      sshKey = "/home/cyryl/.ssh/id_ed25519";
-      system = "x86_64-linux";
-      maxJobs = 1;
-      supportedFeatures = [ "kvm" ];
-      mandatoryFeatures = [ ];
-    }
   ];
 
   nix.extraOptions = ''
diff --git a/nixos/gfx-intel.nix b/nixos/gfx-intel.nix
index 0df5da13..2c0620ff 100644
--- a/nixos/gfx-intel.nix
+++ b/nixos/gfx-intel.nix
@@ -5,7 +5,6 @@
   hardware.opengl = {
     enable = true;
     driSupport = true;
-    s3tcSupport = true;
     extraPackages = with pkgs; [
       vaapiIntel
       vaapiVdpau
diff --git a/nixos/programs/genpass.nix b/nixos/programs/genpass.nix
index 94448f10..be8e5d40 100644
--- a/nixos/programs/genpass.nix
+++ b/nixos/programs/genpass.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1b22m7g55k5ry0vwyd8pakh8rmfkhk37qy5r74cn3n5pv3fcwini";
   };
 
-  cargoSha256 = "0lpavjm9yq7fcyqj8ihs60ipmz3f724rkyh50j6f62g6fkn8jybi";
+  cargoSha256 = "1p6l64s9smhwka8bh3pamqimamxziad859i62nrmxzqc49nq5s7m";
 
   buildInputs = [
     openssl pkgconfig git
diff --git a/nixos/zerotier.nix b/nixos/zerotier.nix
index 40cc6f25..f22fbf23 100644
--- a/nixos/zerotier.nix
+++ b/nixos/zerotier.nix
@@ -6,7 +6,7 @@
   };
 
   networking.hosts = {
-    "172.23.223.219" = [ "brix.local" ];
+    "172.23.153.159" = [ "brix.local" ];
     "172.23.28.139" = [ "vultr1.local" ];
   };