From 9101ebbfe86f666e3d3184439cbbd7a0389f0d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 22 Feb 2020 11:11:10 +0000 Subject: [PATCH] add distributd builds --- nixos/boxes/foureighty.nix | 4 +++- nixos/boxes/skinnyv.nix | 1 + nixos/distributed-builds.nix | 31 +++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 nixos/distributed-builds.nix diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix index 3cbb70e4..3f205fff 100644 --- a/nixos/boxes/foureighty.nix +++ b/nixos/boxes/foureighty.nix @@ -12,10 +12,12 @@ allowDiscards = true; }; }; + loader.grub = { device = "nodev"; efiSupport = true; }; + loader.efi.canTouchEfiVariables = true; }; @@ -30,7 +32,6 @@ }; hardware.nvidiaOptimus.disable = true; - hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ]; imports = [ /etc/nixos/hardware-configuration.nix @@ -40,5 +41,6 @@ ../virtualbox.nix ../zerotier.nix ../i3/system.nix + ../distributed-builds.nix ]; } diff --git a/nixos/boxes/skinnyv.nix b/nixos/boxes/skinnyv.nix index 1f4a3631..8a6ba150 100644 --- a/nixos/boxes/skinnyv.nix +++ b/nixos/boxes/skinnyv.nix @@ -41,5 +41,6 @@ ../gfx-intel.nix ../zerotier.nix ../i3/system.nix + ../distributed-builds.nix ]; } diff --git a/nixos/distributed-builds.nix b/nixos/distributed-builds.nix new file mode 100644 index 00000000..69b1be6a --- /dev/null +++ b/nixos/distributed-builds.nix @@ -0,0 +1,31 @@ +{ config, pkgs, ... }: +{ + nix.buildMachines = [ + { + hostName = "brix.local"; + sshUser = "nix-builder"; + sshKey = "/home/cyryl/.ssh/id_ed25519"; + system = "x86_64-linux"; + maxJobs = 2; + speedFactor = 1; + supportedFeatures = [ "kvm" ]; + mandatoryFeatures = [ ]; + } + { + hostName = "vultr1.local"; + sshUser = "nix-builder"; + sshKey = "/home/cyryl/.ssh/id_ed25519"; + system = "x86_64-linux"; + maxJobs = 4; + speedFactor = 4; + supportedFeatures = [ ]; + mandatoryFeatures = [ ]; + } + ]; + + nix.extraOptions = '' + builders-use-substitutes = true + ''; + nix.distributedBuilds = true; + +}