From 5191759de3ffe979b526358c1544f76e53406e67 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 28 Apr 2025 21:31:43 +0200 Subject: [PATCH 1/4] chore: remove unused file --- systems/x86_64-linux/loptland/index.html | 154 ----------------------- 1 file changed, 154 deletions(-) delete mode 100644 systems/x86_64-linux/loptland/index.html diff --git a/systems/x86_64-linux/loptland/index.html b/systems/x86_64-linux/loptland/index.html deleted file mode 100644 index 4b53624..0000000 --- a/systems/x86_64-linux/loptland/index.html +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - Christoph Hollizeck - - - - - - -
-
-

Christoph Hollizeck

- -

"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore - magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla - pariatur. - Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -

- -

"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore - magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo - consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla - pariatur. - Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -

- -
- - -
-
-
- - - From d8d267d9186a06db30bebcb96bdef83ee11ec7ad Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 28 Apr 2025 21:32:21 +0200 Subject: [PATCH 2/4] zen: make sure the right zen is opened --- modules/nixos/apps/zen-browser/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/nixos/apps/zen-browser/default.nix b/modules/nixos/apps/zen-browser/default.nix index 358a2df..35f4905 100644 --- a/modules/nixos/apps/zen-browser/default.nix +++ b/modules/nixos/apps/zen-browser/default.nix @@ -23,7 +23,10 @@ in zenbrowser ]; - environment.sessionVariables.DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta"; + environment.sessionVariables = { + DEFAULT_BROWSER = "${zenbrowser}/bin/zen-beta"; + BROWSER = "zen-beta"; + }; environment.etc = { "1password/custom_allowed_browsers" = { From 2209050e14f77101b215f9ff2a64340d2a0f283c Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 28 Apr 2025 21:33:02 +0200 Subject: [PATCH 3/4] hydra: allow web interface to access nix store --- modules/nixos/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 105641a..a8f80d2 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -56,7 +56,7 @@ in users = [ "root" config.${namespace}.user.name - ] ++ optional config.services.hydra.enable "hydra hydra-evaluator hydra-queue-runner"; + ] ++ optional config.services.hydra.enable "hydra hydra-www hydra-evaluator hydra-queue-runner"; in { package = cfg.package; From 6e5437a91f56f9cb51932020ded135cad1b905c8 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Mon, 28 Apr 2025 22:07:37 +0200 Subject: [PATCH 4/4] hydra: set localhost to use protocol null --- systems/x86_64-linux/loptland/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/systems/x86_64-linux/loptland/default.nix b/systems/x86_64-linux/loptland/default.nix index 71128ae..785d616 100644 --- a/systems/x86_64-linux/loptland/default.nix +++ b/systems/x86_64-linux/loptland/default.nix @@ -143,12 +143,29 @@ in certificateScheme = "acme-nginx"; }; + nix = { + distributedBuilds = true; + + buildMachines = [ + { + hostName = "localhost"; + protocol = null; + system = "x86_64-linux"; + supportedFeatures = [ + "kvm" + "nixos-test" + "big-parallel" + "benchmark" + ]; + } + ]; + }; + services.hydra = { enable = true; hydraURL = "http://localhost:${toString hydraPort}"; port = hydraPort; notificationSender = "hydra@localhost"; - buildMachinesFiles = [ ]; useSubstitutes = true; };