From e3d76f1999d0512cc4f8f4e8032858000665c3a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sat, 13 Aug 2022 22:31:30 +0200
Subject: [PATCH 1/5] Move ci-runner to user and add git, virsh and nix to path

---
 modules/ci-runner/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/ci-runner/default.nix b/modules/ci-runner/default.nix
index 28325b1..4db4228 100644
--- a/modules/ci-runner/default.nix
+++ b/modules/ci-runner/default.nix
@@ -10,7 +10,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.services.ci-runner = {
+    systemd.user.services.ci-runner = {
       enable = true;
 
       description = "CI runner for the PubSolarOS repository that can run test VM instances with KVM.";
@@ -20,6 +20,8 @@ in
         Restart = "always";
       };
 
+      path = "${pkgs.git}/bin:${pkgs.nix}/bin:${pkgs.libvirt}/bin";
+
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" "libvirtd.service" ];
 
@@ -29,7 +31,7 @@ in
     age.secrets."drone-runner-exec-config" = {
       file = "${self}/secrets/drone-runner-exec-config";
       mode = "700";
-      owner = "root";
+      owner = psCfg.user.name;
     };
   };
 }

From c5362c045313d983bd571ef4dd6fd5d48d53f31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sun, 14 Aug 2022 20:24:50 +0200
Subject: [PATCH 2/5] Fix path in drone runner exec

---
 modules/ci-runner/default.nix | 6 +++++-
 pkgs/drone-docker-runner.nix  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/ci-runner/default.nix b/modules/ci-runner/default.nix
index 4db4228..1460ab1 100644
--- a/modules/ci-runner/default.nix
+++ b/modules/ci-runner/default.nix
@@ -20,7 +20,11 @@ in
         Restart = "always";
       };
 
-      path = "${pkgs.git}/bin:${pkgs.nix}/bin:${pkgs.libvirt}/bin";
+      path = [
+        pkgs.git
+        pkgs.nix
+        pkgs.libvirt
+      ];
 
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" "libvirtd.service" ];
diff --git a/pkgs/drone-docker-runner.nix b/pkgs/drone-docker-runner.nix
index 7d09853..e1773d5 100644
--- a/pkgs/drone-docker-runner.nix
+++ b/pkgs/drone-docker-runner.nix
@@ -6,7 +6,7 @@ self: with self; ''
         --env=DRONE_RPC_PROTO=$DRONE_RPC_PROTO \
         --env=DRONE_RPC_HOST=$DRONE_RPC_HOST \
         --env=DRONE_RPC_SECRET=$(${self.libsecret}/bin/secret-tool lookup drone rpc-secret) \
-        --env=DRONE_RUNNER_CAPACITY=4 \
+        --env=DRONE_RUNNER_CAPACITY=8 \
         --env=DRONE_RUNNER_NAME=$(${self.inetutils}/bin/hostname) \
         --publish=3000:3000 \
         --restart=always \

From 14ba7010615ddd723474bb5844ff686f42bfaabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sun, 14 Aug 2022 20:28:18 +0200
Subject: [PATCH 3/5] Don't use libvirt in ci-runner

---
 modules/ci-runner/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/ci-runner/default.nix b/modules/ci-runner/default.nix
index 1460ab1..0e78e55 100644
--- a/modules/ci-runner/default.nix
+++ b/modules/ci-runner/default.nix
@@ -23,11 +23,10 @@ in
       path = [
         pkgs.git
         pkgs.nix
-        pkgs.libvirt
       ];
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "libvirtd.service" ];
+      after = [ "network.target" ];
 
       script = ''${pkgs.drone-runner-exec}/bin/drone-runner-exec daemon /run/agenix/drone-runner-exec-config'';
     };

From dbee2f03e7fb444dde5e7bcbabcf6fbeb5c45cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Thu, 25 Aug 2022 15:17:17 +0200
Subject: [PATCH 4/5] Import the full environment again

---
 pkgs/sway-service.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/sway-service.nix b/pkgs/sway-service.nix
index 15781a1..2ab84c6 100644
--- a/pkgs/sway-service.nix
+++ b/pkgs/sway-service.nix
@@ -1,6 +1,6 @@
 self: with self; ''
   # first import environment variables from the login manager
-  systemctl --user import-environment $IMPORT_ENVIRONMENT_ENV_LIST DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP PATH;
+  systemctl --user import-environment;
   # then start the service
   exec systemctl --wait --user start sway.service
 ''

From 8fc8ac2d586735b6a697c950b6536746ac1e73e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Thu, 25 Aug 2022 15:25:34 +0200
Subject: [PATCH 5/5] Fix service startup for ci-runner

---
 modules/ci-runner/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/ci-runner/default.nix b/modules/ci-runner/default.nix
index 0e78e55..1460ab1 100644
--- a/modules/ci-runner/default.nix
+++ b/modules/ci-runner/default.nix
@@ -23,10 +23,11 @@ in
       path = [
         pkgs.git
         pkgs.nix
+        pkgs.libvirt
       ];
 
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network.target" "libvirtd.service" ];
 
       script = ''${pkgs.drone-runner-exec}/bin/drone-runner-exec daemon /run/agenix/drone-runner-exec-config'';
     };