From 2531d56d76663b5c948c9816e07e51900e483c54 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Mon, 13 Oct 2025 11:03:07 -0700
Subject: [PATCH 1/2] fix(forgejo-runner): mwee

---
 .../servers/forgejo-runner/forgejo-runner.nix | 25 ++++++++++---------
 nixos/servers/forgejo/forgejo.nix             |  3 +++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/nixos/servers/forgejo-runner/forgejo-runner.nix b/nixos/servers/forgejo-runner/forgejo-runner.nix
index 493aa4d5..78d6dfc4 100644
--- a/nixos/servers/forgejo-runner/forgejo-runner.nix
+++ b/nixos/servers/forgejo-runner/forgejo-runner.nix
@@ -42,26 +42,27 @@
           # tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
           tokenFile = config.sops.secrets.forgejo-runner-token.path;
           labels = let
+            prefix = "docker://ghcr.io/catthehacker/ubuntu:act-";
             arches = {
               x86_64-linux = [
-                "ubuntu-latest:docker://node:16-bullseye"
-                "ubuntu-22.04:docker://node:16-bullseye"
-                "ubuntu-20.04:docker://node:16-bullseye"
-                "ubuntu-18.04:docker://node:16-buster"
+                "ubuntu-latest:${prefix}-latest"
+                "ubuntu-22.04:${prefix}-22.04"
+                "ubuntu-20.04:${prefix}-20.04"
+                "ubuntu-18.04:${prefix}-18.04"
                 "nixos-latest:docker://nixos/nix"
-                "ubuntu-latest-x86_64:docker://node:16-bullseye"
-                "ubuntu-22.04-x86_64:docker://node:16-bullseye"
-                "ubuntu-20.04_x86_64:docker://node:16-bullseye"
-                "ubuntu-18.04-x86_64:docker://node:16-buster"
+                "ubuntu-latest-x86_64:${prefix}-latest"
+                "ubuntu-22.04-x86_64:${prefix}-22.04"
+                "ubuntu-20.04_x86_64:${prefix}-20.04"
+                "ubuntu-18.04-x86_64:${prefix}-18.04"
                 "nixos-latest-x86_64:docker://nixos/nix"
                 ## optionally provide native execution on the host:
                 # "native:host"
               ];
               aarch64-linux = [
-                "ubuntu-latest-aarch64:docker://node:16-bullseye"
-                "ubuntu-22.04-aarch64:docker://node:16-bullseye"
-                "ubuntu-20.04_aarch64:docker://node:16-bullseye"
-                "ubuntu-18.04-aarch64:docker://node:16-buster"
+                "ubuntu-latest-aarch64:${prefix}-latest"
+                "ubuntu-22.04-aarch64:${prefix}-22.04"
+                "ubuntu-20.04_aarch64:${prefix}-20.04"
+                "ubuntu-18.04-aarch64:${prefix}-18.04"
                 "nixos-latest-aarch64:docker://nixos/nix"
               ];
             };
diff --git a/nixos/servers/forgejo/forgejo.nix b/nixos/servers/forgejo/forgejo.nix
index 95c2146a..a9fee5d5 100644
--- a/nixos/servers/forgejo/forgejo.nix
+++ b/nixos/servers/forgejo/forgejo.nix
@@ -5,6 +5,9 @@ in {
   services.forgejo = {
     enable = true;
     settings = {
+      DEFAULT = {
+        APP_NAME = "kittywitch forge";
+      };
       server = {
         DOMAIN = domain;
         ROOT_URL = "https://${domain}";

From 1850f7c2837abb7fa7042adeeadaf63bd9855ba1 Mon Sep 17 00:00:00 2001
From: Kat Inskip <kat@inskip.me>
Date: Mon, 13 Oct 2025 11:04:01 -0700
Subject: [PATCH 2/2] fix: crying

---
 nixos/servers/forgejo-runner/forgejo-runner.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/servers/forgejo-runner/forgejo-runner.nix b/nixos/servers/forgejo-runner/forgejo-runner.nix
index 78d6dfc4..c777921e 100644
--- a/nixos/servers/forgejo-runner/forgejo-runner.nix
+++ b/nixos/servers/forgejo-runner/forgejo-runner.nix
@@ -42,7 +42,7 @@
           # tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
           tokenFile = config.sops.secrets.forgejo-runner-token.path;
           labels = let
-            prefix = "docker://ghcr.io/catthehacker/ubuntu:act-";
+            prefix = "docker://ghcr.io/catthehacker/ubuntu:act";
             arches = {
               x86_64-linux = [
                 "ubuntu-latest:${prefix}-latest"