@@ -33,6 +33,7 @@
     ../roles/server.nix
     ../roles/reverse-proxy.nix
     ../roles/binary-cache.nix
+    ../roles/forgejo-runner.nix
     ../roles/searchix.nix
     ../settings/services/git-server.nix
   ];
@@ -52,7 +53,6 @@ powerdns.file = ../../secrets/powerdns.age;
     redis-website.file = ../../secrets/redis-website.age;
     cifs-jellyfin.file = ../../secrets/cifs-jellyfin.age;
     cifs-paperless.file = ../../secrets/cifs-paperless.age;
-    codeberg-runner.file = ../../secrets/codeberg-runner.age;
     ntfy.file = ../../secrets/ntfy.age;
     pocket-id.file = ../../secrets/pocket-id.age;
     readeck.file = ../../secrets/readeck.age;
@@ -873,34 +873,6 @@ homeMode = "770";
   };
   users.groups.laminar.members = [ "caddy" ];
 
-  services.gitea-actions-runner = {
-    package = pkgs.forgejo-runner;
-    instances.codeberg = {
-      name = "linde";
-      enable = true;
-      url = "https://codeberg.org";
-      tokenFile = config.age.secrets.codeberg-runner.path;
-      labels = [
-        "docker:docker://node:24-alpine"
-        "alpine-latest:docker://node:24-alpine"
-        "nixos:host"
-      ];
-
-      hostPackages = with pkgs; [
-        bash
-        coreutils
-        curl
-        gawk
-        gitMinimal
-        gnused
-        nix
-        nodejs
-        wget
-      ];
-    };
-  };
-  virtualisation.podman.enable = true;
-
   services.ntfy-sh = {
     enable = true;
     settings = {
@@ -912,18 +884,6 @@ enable-login = true;
       require-login = true;
     };
     environmentFile = config.age.secrets.ntfy.path;
-  };
-
-  virtualisation.containers = {
-    enable = true;
-    policy = {
-      default = [ { type = "insecureAcceptAnything"; } ];
-    };
-  };
-  virtualisation.podman = {
-    autoPrune = {
-      enable = true;
-    };
   };
 
   fileSystems."/srv/video" = {

@@ -12,6 +12,7 @@ {
   imports = [
     ../roles/server.nix
     ../roles/reverse-proxy.nix
+    ../roles/forgejo-runner.nix
   ];
   system.stateVersion = "25.11";
 

@@ -0,0 +1,49 @@
+{
+  config,
+  pkgs,
+  ...
+}:
+{
+  age.secrets.codeberg-runner.file = ../../secrets/codeberg-runner.age;
+
+  services.gitea-actions-runner = {
+    package = pkgs.forgejo-runner;
+    instances.codeberg = {
+      name = config.networking.hostName;
+      enable = true;
+      url = "https://codeberg.org";
+      tokenFile = config.age.secrets.codeberg-runner.path;
+      labels = [
+        "docker:docker://node:24-alpine"
+        "alpine-latest:docker://node:24-alpine"
+        "nixos:host"
+      ];
+
+      hostPackages = with pkgs; [
+        bash
+        coreutils
+        curl
+        gawk
+        gitMinimal
+        gnused
+        nix
+        nodejs
+        wget
+      ];
+    };
+  };
+  virtualisation.podman.enable = true;
+
+  virtualisation.containers = {
+    enable = true;
+    policy = {
+      default = [ { type = "insecureAcceptAnything"; } ];
+    };
+  };
+  virtualisation.podman = {
+    autoPrune = {
+      enable = true;
+    };
+  };
+
+}