From 782088bd87f9c228bfb5eb6859de4329e5c44463 Mon Sep 17 00:00:00 2001 From: Thilo Billerbeck Date: Fri, 15 Mar 2024 14:42:02 +0100 Subject: [PATCH] disable droidcam, add builders --- configs/thilo-laptop/nixos.nix | 1 + configs/thilo-pc/nixos.nix | 1 + nixos/builders.nix | 78 ++++++++++++++++++++++++++++++++++ nixos/common.nix | 1 - 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 nixos/builders.nix diff --git a/configs/thilo-laptop/nixos.nix b/configs/thilo-laptop/nixos.nix index faf0e7c..e9f5ac5 100644 --- a/configs/thilo-laptop/nixos.nix +++ b/configs/thilo-laptop/nixos.nix @@ -4,6 +4,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix ./../../nixos/common.nix + ./../../nixos/builders.nix ]; # Bootloader. diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix index 33297aa..e90ec25 100644 --- a/configs/thilo-pc/nixos.nix +++ b/configs/thilo-pc/nixos.nix @@ -8,6 +8,7 @@ # Include the results of the hardware scan. ./hardware-configuration.nix ./../../nixos/common.nix + ./../../nixos/builders.nix ]; # Bootloader. diff --git a/nixos/builders.nix b/nixos/builders.nix new file mode 100644 index 0000000..71d62be --- /dev/null +++ b/nixos/builders.nix @@ -0,0 +1,78 @@ +{ + programs.ssh.knownHosts = { + "build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv"; + "build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z"; + "build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr"; + "build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1"; + }; + + nix = { + distributedBuilds = true; + buildMachines = [ { + hostName = "build1.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "hexa"; + sshKey = "/var/keys/id_remotebuild"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + maxJobs = 4; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } { + hostName = "build2.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "hexa"; + sshKey = "/var/keys/id_remotebuild"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + maxJobs = 4; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } { + hostName = "build3.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "hexa"; + sshKey = "/var/keys/id_remotebuild"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + maxJobs = 4; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } { + hostName = "build4.darmstadt.ccc.de"; + protocol = "ssh"; + sshUser = "hexa"; + sshKey = "/var/keys/id_remotebuild"; + systems = [ + "i686-linux" + "x86_64-linux" + ]; + # this node has half the cpu of the others + maxJobs = 2; + speedFactor = 6; + supportedFeatures = [ + "big-parallel" + "kvm" + "nixos-test" + ]; + } ]; + }; +} diff --git a/nixos/common.nix b/nixos/common.nix index 507183f..de50e35 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -72,7 +72,6 @@ steam.enable = true; zsh.enable = true; adb.enable = true; - droidcam.enable = true; noisetorch.enable = true; };