reformat according to rfc standard

This commit is contained in:
Thilo Billerbeck 2024-05-28 14:38:22 +02:00
parent 5da37d8133
commit 3bceb198a8
34 changed files with 480 additions and 306 deletions

View file

@ -8,71 +8,76 @@
nix = {
distributedBuilds = true;
buildMachines = [ {
hostName = "build1.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
} {
hostName = "build2.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
} {
hostName = "build3.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
} {
hostName = "build4.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
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"
];
} ];
buildMachines = [
{
hostName = "build1.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
}
{
hostName = "build2.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
}
{
hostName = "build3.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
systems = [
"i686-linux"
"x86_64-linux"
];
maxJobs = 4;
speedFactor = 6;
supportedFeatures = [
"big-parallel"
"kvm"
"nixos-test"
];
}
{
hostName = "build4.darmstadt.ccc.de";
protocol = "ssh";
sshUser = "avocadoom";
sshKey = "/home/thilo/.ssh/id_darmstadt-ccc-de";
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"
];
}
];
};
}

View file

@ -1,4 +1,10 @@
{ config, pkgs, lib, inputs, ... }:
{
config,
pkgs,
lib,
inputs,
...
}:
{
imports = [ ./../nix.nix ];
@ -10,13 +16,15 @@
# This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome!
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}")
config.nix.registry;
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
};
nixpkgs = {
config = {
permittedInsecurePackages = [ "electron-24.8.6" "electron-25.9.0" ];
permittedInsecurePackages = [
"electron-24.8.6"
"electron-25.9.0"
];
allowUnfree = true;
};
};
@ -78,7 +86,12 @@
};
};
environment.systemPackages = with pkgs; [ git zsh kitty steamtinkerlaunch ];
environment.systemPackages = with pkgs; [
git
zsh
kitty
steamtinkerlaunch
];
networking.networkmanager.enable = true;
@ -91,7 +104,9 @@
pulse.enable = true;
jack.enable = true;
};
tailscale = { enable = true; };
tailscale = {
enable = true;
};
flatpak.enable = true;
avahi = {
enable = true;