Compare commits

..

No commits in common. "ca48d67afc63958e4a29b59eb65733c60edb7d5e" and "32460978a49dfd2f58602c1274ee28f7a84f2d5b" have entirely different histories.

7 changed files with 22 additions and 36 deletions

View file

@ -88,9 +88,5 @@
}; };
} }
); );
hydraJobs = {
inherit (self)
packages formatter nixosConfigurations;
};
}; };
} }

View file

@ -76,7 +76,7 @@ in
services.pipewire = { services.pipewire = {
enable = true; enable = true;
systemWide = true; systemWide = false;
alsa = { alsa = {
enable = true; enable = true;
support32Bit = true; support32Bit = true;
@ -199,6 +199,15 @@ in
} }
]; ];
}; };
"10-x11=bell" = {
"context.modules" = [
{
name = "libpipewire-module-x11-bell";
args = {
};
}
];
};
}; };
}; };
}; };

View file

@ -41,10 +41,13 @@ in
"nix-command" "nix-command"
"flakes" "flakes"
"auto-allocate-uids" "auto-allocate-uids"
"ca-derivations"
"cgroups" "cgroups"
"dynamic-derivations"
"fetch-closure" "fetch-closure"
"impure-derivations" "impure-derivations"
"no-url-literals" "no-url-literals"
"recursive-nix"
]; ];
auto-allocate-uids = true; auto-allocate-uids = true;
use-cgroups = true; use-cgroups = true;
@ -54,10 +57,6 @@ in
builders-use-substitutes = true; builders-use-substitutes = true;
download-attempts = 1; download-attempts = 1;
fallback = true; fallback = true;
allowed-uris = [
"github:"
"gitlab:"
];
}; };
buildMachines = buildMachines =
let let
@ -70,15 +69,7 @@ in
[ (getMainArch name) ] [ (getMainArch name) ]
++ self.nixosConfigurations.${name}.config.nix.settings.extra-platforms or [ ]; ++ self.nixosConfigurations.${name}.config.nix.settings.extra-platforms or [ ];
in in
lib.filter (builder: builder.hostName != config.networking.hostName)
[ [
{
hostName = "localhost";
protocol = null;
systems = getArchs config.networking.hostName;
supportedFeatures = config.nix.settings.system-features;
maxJobs = (lib.elemAt config.facter.report.hardware.cpu 0).cores;
}
{ {
systems = getArchs "hetzner"; systems = getArchs "hetzner";
supportedFeatures = self.nixosConfigurations.hetzner.config.nix.settings.system-features; supportedFeatures = self.nixosConfigurations.hetzner.config.nix.settings.system-features;
@ -88,7 +79,7 @@ in
sshUser = "builder"; sshUser = "builder";
sshKey = "/root/.ssh/builder"; sshKey = "/root/.ssh/builder";
speedFactor = 5; speedFactor = 5;
maxJobs = (lib.elemAt self.nixosConfigurations.hetzner.config.facter.report.hardware.cpu 0).cores; maxJobs = 12;
} }
{ {
systems = getArchs "zap"; systems = getArchs "zap";
@ -98,7 +89,7 @@ in
protocol = "ssh-ng"; protocol = "ssh-ng";
sshUser = "builder"; sshUser = "builder";
sshKey = "/root/.ssh/builder"; sshKey = "/root/.ssh/builder";
maxJobs = (lib.elemAt self.nixosConfigurations.zap.config.facter.report.hardware.cpu 0).cores; maxJobs = 4;
} }
{ {
systems = getArchs "kuraokami"; systems = getArchs "kuraokami";
@ -109,7 +100,7 @@ in
sshUser = "builder"; sshUser = "builder";
sshKey = "/root/.ssh/builder"; sshKey = "/root/.ssh/builder";
speedFactor = 10; speedFactor = 10;
maxJobs = (lib.elemAt self.nixosConfigurations.kuraokami.config.facter.report.hardware.cpu 0).cores; maxJobs = 24;
} }
]; ];
distributedBuilds = true; distributedBuilds = true;

View file

@ -10,6 +10,10 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services = { services = {
xserver = {
enable = true;
};
libinput.enable = true; libinput.enable = true;
displayManager.sddm = { displayManager.sddm = {

View file

@ -25,7 +25,6 @@ in
"networkmanager" "networkmanager"
"pipewire" "pipewire"
"audio" "audio"
"video"
"adbusers" "adbusers"
"dialout" "dialout"
]; ];

View file

@ -161,7 +161,7 @@ in
WOODPECKER_SERVER = "localhost:9000"; WOODPECKER_SERVER = "localhost:9000";
WOODPECKER_MAX_WORKFLOWS = "8"; WOODPECKER_MAX_WORKFLOWS = "8";
WOODPECKER_AGENT_SECRET = ""; WOODPECKER_AGENT_SECRET = "";
WOODPECKER_BACKEND = "docker"; WOODPECKER_BACKEND= "docker";
DOCKER_HOST = "unix:///run/podman/podman.sock"; DOCKER_HOST = "unix:///run/podman/podman.sock";
}; };
extraGroups = [ "podman" ]; extraGroups = [ "podman" ];
@ -177,20 +177,12 @@ in
allowedTCPPorts = [ 53 ]; allowedTCPPorts = [ 53 ];
}; };
users.users.backupftp = { users.users.backupftp = {
isNormalUser = true; isNormalUser = true;
initialPassword = "backupPassword"; initialPassword = "backupPassword";
}; };
services.hydra = {
enable = true;
hydraURL = "https://hydra.missing.ninja";
notificationSender = "hydra@missing.ninja";
buildMachinesFiles = [];
useSubstitutes = true;
};
disko.devices = { disko.devices = {
disk = { disk = {
vdb = { vdb = {

View file

@ -55,11 +55,6 @@
enableACME = true; enableACME = true;
locations."/".proxyPass = "http://localhost:8080"; locations."/".proxyPass = "http://localhost:8080";
}; };
"hydra.missing.ninja" = {
forceSSL = true;
enableACME = true;
locations."/".proxyPass = "http://localhost:3000";
};
"ci.missing.ninja" = { "ci.missing.ninja" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;