From cf6d3f3b2f432a713e432e3da5cbe3ce9e5bd317 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 May 2025 22:02:25 +0200 Subject: [PATCH 1/7] enable systemwide audio --- nixos-modules/audio/default.nix | 2 +- nixos-modules/users/jopejoe1/default.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos-modules/audio/default.nix b/nixos-modules/audio/default.nix index 7ddd829..fa75122 100644 --- a/nixos-modules/audio/default.nix +++ b/nixos-modules/audio/default.nix @@ -76,7 +76,7 @@ in services.pipewire = { enable = true; - systemWide = false; + systemWide = true; alsa = { enable = true; support32Bit = true; diff --git a/nixos-modules/users/jopejoe1/default.nix b/nixos-modules/users/jopejoe1/default.nix index ce4e99d..87d3ed0 100644 --- a/nixos-modules/users/jopejoe1/default.nix +++ b/nixos-modules/users/jopejoe1/default.nix @@ -25,6 +25,7 @@ in "networkmanager" "pipewire" "audio" + "video" "adbusers" "dialout" ]; From 9c12841f314e75a19d0c1f9387d0c8d5cb80afec Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 May 2025 22:16:38 +0200 Subject: [PATCH 2/7] enable x server --- nixos-modules/plasma/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos-modules/plasma/default.nix b/nixos-modules/plasma/default.nix index 402e889..ef107fe 100644 --- a/nixos-modules/plasma/default.nix +++ b/nixos-modules/plasma/default.nix @@ -31,5 +31,6 @@ in }; networking.networkmanager.enable = true; + services.xserver.enable = true; }; } From c2053e726f7647b3595e51a531b7e030325f0690 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 May 2025 22:17:23 +0200 Subject: [PATCH 3/7] disbale x11 --- nixos-modules/plasma/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos-modules/plasma/default.nix b/nixos-modules/plasma/default.nix index ef107fe..6114ee8 100644 --- a/nixos-modules/plasma/default.nix +++ b/nixos-modules/plasma/default.nix @@ -10,10 +10,6 @@ in config = lib.mkIf cfg.enable { services = { - xserver = { - enable = true; - }; - libinput.enable = true; displayManager.sddm = { @@ -31,6 +27,5 @@ in }; networking.networkmanager.enable = true; - services.xserver.enable = true; }; } From feefbace837283ef8f5fa75cec5bb57426c1e8b8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 31 May 2025 22:23:24 +0200 Subject: [PATCH 4/7] remove x11 bell --- nixos-modules/audio/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nixos-modules/audio/default.nix b/nixos-modules/audio/default.nix index fa75122..2a05f94 100644 --- a/nixos-modules/audio/default.nix +++ b/nixos-modules/audio/default.nix @@ -199,15 +199,6 @@ in } ]; }; - "10-x11=bell" = { - "context.modules" = [ - { - name = "libpipewire-module-x11-bell"; - args = { - }; - } - ]; - }; }; }; }; From f609b0212cd77be82196c2efd28d10494a961eb0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Jun 2025 19:25:08 +0200 Subject: [PATCH 5/7] fmt --- systems/hetzner/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index d38583f..41703ec 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -161,7 +161,7 @@ in WOODPECKER_SERVER = "localhost:9000"; WOODPECKER_MAX_WORKFLOWS = "8"; WOODPECKER_AGENT_SECRET = ""; - WOODPECKER_BACKEND= "docker"; + WOODPECKER_BACKEND = "docker"; DOCKER_HOST = "unix:///run/podman/podman.sock"; }; extraGroups = [ "podman" ]; @@ -177,7 +177,6 @@ in allowedTCPPorts = [ 53 ]; }; - users.users.backupftp = { isNormalUser = true; initialPassword = "backupPassword"; From 295fe0f23d92c6548507c82cc37ed2ff7d58dcf3 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Jun 2025 20:42:13 +0200 Subject: [PATCH 6/7] enable hydra --- flake.nix | 4 ++++ nixos-modules/nix/default.nix | 7 ++++--- systems/hetzner/default.nix | 9 +++++++++ systems/hetzner/nginx.nix | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index b72e86b..82942f7 100644 --- a/flake.nix +++ b/flake.nix @@ -88,5 +88,9 @@ }; } ); + hydraJobs = { + inherit (self) + packages formatter nixosConfigurations; + }; }; } diff --git a/nixos-modules/nix/default.nix b/nixos-modules/nix/default.nix index 974c9f8..e2c98a3 100644 --- a/nixos-modules/nix/default.nix +++ b/nixos-modules/nix/default.nix @@ -41,13 +41,10 @@ in "nix-command" "flakes" "auto-allocate-uids" - "ca-derivations" "cgroups" - "dynamic-derivations" "fetch-closure" "impure-derivations" "no-url-literals" - "recursive-nix" ]; auto-allocate-uids = true; use-cgroups = true; @@ -57,6 +54,10 @@ in builders-use-substitutes = true; download-attempts = 1; fallback = true; + allowed-uris = [ + "github:" + "gitlab:" + ]; }; buildMachines = let diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 41703ec..fbe36e1 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -182,6 +182,15 @@ in initialPassword = "backupPassword"; }; + services.hydra = { + enable = true; + hydraURL = "https://hydra.missing.ninja"; + notificationSender = "hydra@missing.ninja"; + buildMachinesFiles = []; + useSubstitutes = true; + }; + + disko.devices = { disk = { vdb = { diff --git a/systems/hetzner/nginx.nix b/systems/hetzner/nginx.nix index a89c405..318d823 100644 --- a/systems/hetzner/nginx.nix +++ b/systems/hetzner/nginx.nix @@ -55,6 +55,11 @@ enableACME = true; locations."/".proxyPass = "http://localhost:8080"; }; + "hydra.missing.ninja" = { + forceSSL = true; + enableACME = true; + locations."/".proxyPass = "http://localhost:3000"; + }; "ci.missing.ninja" = { forceSSL = true; enableACME = true; From ca48d67afc63958e4a29b59eb65733c60edb7d5e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 2 Jun 2025 21:02:37 +0200 Subject: [PATCH 7/7] update builder config --- nixos-modules/nix/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos-modules/nix/default.nix b/nixos-modules/nix/default.nix index e2c98a3..3347003 100644 --- a/nixos-modules/nix/default.nix +++ b/nixos-modules/nix/default.nix @@ -70,7 +70,15 @@ in [ (getMainArch name) ] ++ self.nixosConfigurations.${name}.config.nix.settings.extra-platforms or [ ]; 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"; supportedFeatures = self.nixosConfigurations.hetzner.config.nix.settings.system-features; @@ -80,7 +88,7 @@ in sshUser = "builder"; sshKey = "/root/.ssh/builder"; speedFactor = 5; - maxJobs = 12; + maxJobs = (lib.elemAt self.nixosConfigurations.hetzner.config.facter.report.hardware.cpu 0).cores; } { systems = getArchs "zap"; @@ -90,7 +98,7 @@ in protocol = "ssh-ng"; sshUser = "builder"; sshKey = "/root/.ssh/builder"; - maxJobs = 4; + maxJobs = (lib.elemAt self.nixosConfigurations.zap.config.facter.report.hardware.cpu 0).cores; } { systems = getArchs "kuraokami"; @@ -101,7 +109,7 @@ in sshUser = "builder"; sshKey = "/root/.ssh/builder"; speedFactor = 10; - maxJobs = 24; + maxJobs = (lib.elemAt self.nixosConfigurations.kuraokami.config.facter.report.hardware.cpu 0).cores; } ]; distributedBuilds = true;