natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hosts/modules: put builder back in a separate file

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-06-24 16:25:48 +05:30
parent f88702525b
commit 8f7781f293
7 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/default.nix
View File

@@ -38,6 +38,7 @@ in
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./remilia ./remilia
./modules/x86builder.nix
inputs.mailserver.nixosModules.mailserver inputs.mailserver.nixosModules.mailserver
{ nixpkgs.pkgs = self.legacyPackages.${system}; } { nixpkgs.pkgs = self.legacyPackages.${system}; }
] ]

11
hosts/modules/minimal.nix
View File

@@ -39,16 +39,7 @@
package = pkgs.nixUnstable; package = pkgs.nixUnstable;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
builders-use-substitutes = true
''; '';
settings.trusted-users = [ "root" ]; settings.trusted-users = [ "root" "spark" ];
buildMachines = [{
hostName = "satori";
systems = [ "x86_64-linux" "aarch64-linux" ];
maxJobs = 4;
speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
}];
distributedBuilds = true;
}; };
} }

16
hosts/modules/x86builder.nix Normal file
View File

@@ -0,0 +1,16 @@
{ config, ... }:
{
nix = {
extraOptions = ''
builders-use-substitutes = true
'';
buildMachines = [{
hostName = "satori";
systems = [ "x86_64-linux" "aarch64-linux" ];
maxJobs = 4;
speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
}];
distributedBuilds = true;
};
}

20
hosts/satori/services.nix
View File

@@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
let let
udev-cypher = pkgs.stdenv.mkDerivation { udev-cypher = pkgs.stdenv.mkDerivation {
name = "udev-cypher"; name = "udev-cypher";
dontBuild = true; dontBuild = true;
@@ -11,16 +11,16 @@ udev-cypher = pkgs.stdenv.mkDerivation {
installPhase = '' installPhase = ''
mkdir -p $out/lib/udev/rules.d mkdir -p $out/lib/udev/rules.d
touch $out/lib/udev/rules.d/21-cypherock.rules touch $out/lib/udev/rules.d/21-cypherock.rules
cat << 'EOF' >> $out/lib/udev/rules.d/21-cypherock.rules cat << 'EOF' >> $out/lib/udev/rules.d/21-cypherock.rules
SUBSYSTEM=="input", GROUP="input", MODE="0666" SUBSYSTEM=="input", GROUP="input", MODE="0666"
SUBSYSTEM=="usb", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="666", GROUP="plugdev" SUBSYSTEM=="usb", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="666", GROUP="plugdev"
KERNEL=="hidraw*", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="0666", GROUP="plugdev" KERNEL=="hidraw*", ATTRS{idVendor}=="3503", ATTRS{idProduct}=="0103", MODE="0666", GROUP="plugdev"
0483:374f 0483:374f
SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="666", GROUP="plugdev" SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="666", GROUP="plugdev"
KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="0666", GROUP="plugdev" KERNEL=="hidraw*", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="0666", GROUP="plugdev"
EOF EOF
''; '';
}; };
in in
{ {
services = { services = {