c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Remove this miserable nix.distributedBuilds shit

This commit is contained in:
Ehmry - 2020-02-22 13:18:30 +01:00
parent a255f545e3
commit ffdecafac7
4 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/hydra/configuration.nix
View File

@ -7,7 +7,6 @@
./cache.nix ./cache.nix
../../lib ../../lib
../../lib/hq.nix ../../lib/hq.nix
../../lib/buildfarmer.nix
../../lib/yggdrasil.nix ../../lib/yggdrasil.nix
]; ];
@ -49,7 +48,6 @@
programs.mosh.enable = true; programs.mosh.enable = true;
nix = { nix = {
distributedBuilds = true;
package = pkgs.nixFlakes; package = pkgs.nixFlakes;
useSandbox = false; useSandbox = false;
maxJobs = lib.mkDefault 10; maxJobs = lib.mkDefault 10;

25
hosts/hydra/hydra.nix
View File

@ -2,19 +2,24 @@
{ {
nix = { nix = {
binaryCaches = [ "https://cache.nixos.org" "https://cache.dhall-lang.org" ]; binaryCaches = [
binaryCachePublicKeys = "https://cache.server7.hq.c3d2.de"
[ "cache.dhall-lang.org:I9/H18WHd60olG5GsIjolp7CtepSgJmM2CsO813VTmM=" ]; "https://cache.nixos.org"
buildMachines = [{ "https://cache.dhall-lang.org"
hostName = "server7.hq.c3d2.de"; ];
system = "x86_64-linux"; binaryCachePublicKeys = [
sshUser = "buildfarmer"; "cache.server7.hq.c3d2.de:x8JLRG26zRZ8ysYZLEkPxuAYuK1VSJi/aMAEIs2Lv+U="
sshKey = "/root/.ssh/id_ed25519"; "cache.dhall-lang.org:I9/H18WHd60olG5GsIjolp7CtepSgJmM2CsO813VTmM="
maxJobs = 10; ];
}];
extraOptions = '' extraOptions = ''
allowed-uris = http:// https:// allowed-uris = http:// https://
''; '';
buildMachines = [{
hostName = "localhost";
system = "x86_64-linux";
supportedFeatures = [ "kvm" "nixos-test" "big-parallel" "benchmark" ];
maxJobs = 8;
}];
}; };
services.hydra = { services.hydra = {

1
hosts/server7/configuration.nix
View File

@ -6,7 +6,6 @@ in {
<nixpkgs/nixos/modules/profiles/minimal.nix> <nixpkgs/nixos/modules/profiles/minimal.nix>
../../lib ../../lib
../../lib/default-gateway.nix ../../lib/default-gateway.nix
../../lib/buildfarmer.nix
../../lib/yggdrasil.nix ../../lib/yggdrasil.nix
./containers ./containers
./hardware-configuration.nix ./hardware-configuration.nix

15
lib/buildfarmer.nix
View File

@ -1,15 +0,0 @@
{ config, pkgs, ... }:
{
users.users.buildfarmer = {
isNormalUser = false;
description = "User for remote Nix builds";
useDefaultShell = true;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMwS9B/d6QJUyZW9b52R2TlJgkI5oGDyOvzMN7H9Cz4/ hydra@hydra"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINA3x2+5ieo5QgehFHqXCYAYZSP8dxXyE1E/fSLnny8y root@serve7"
];
};
nix.trustedUsers = [ "buildfarmer" ];
}