applications/git/forgejo.nix

@@ -76,12 +76,6 @@ in {
       };
     };
 
-    # for signing reasons
-    programs.gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-    };
-
     services.forgejo = {
       enable = true;
       package = pkgs.forgejo;
@@ -98,21 +92,11 @@ in {
 
         # You can temporarily allow registration to create an admin user.
         service.DISABLE_REGISTRATION = true;
-
         # Add support for actions, based on act: https://github.com/nektos/act
         actions = {
           ENABLED = true;
           DEFAULT_ACTIONS_URL = "github";
         };
-
-        # Allow for signing off merge requests
-        "repository.signing" = {
-          SIGNING_KEY = "5B2DED0FE9F8627A";
-          SIGNING_NAME = "Skynet";
-          SIGNING_EMAIL = "forgejo@glados.skynet.ie";
-          MERGES = "always";
-        };
-
         # Sending emails is completely optional
         # You can send a test email from the web UI at:
         # Profile Picture > Site Administration > Configuration >  Mailer Configuration

applications/git/forgejo_runner.nix

@@ -107,12 +107,6 @@ in {
       };
     };
 
-    boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
-    virtualisation.docker.enable = true;
-
-    # taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128
-    virtualisation.docker.listenOptions = ["/run/docker.sock" "127.0.0.1:2375"];
-
     # the actual runner
     services.gitea-actions-runner = {
       package = pkgs.forgejo-actions-runner;
@@ -124,8 +118,8 @@ in {
         labels = [
           ## optionally provide native execution on the host:
           "nix:host"
-          "docker:docker://node:22-bookworm"
-          "ubuntu-latest:docker://node:22-bookworm"
+          "docker:docker://node:16-bullseye"
+          "ubuntu-latest:docker://node:16-bullseye"
         ];
 
         hostPackages = with pkgs; [
@@ -134,7 +128,7 @@ in {
           coreutils
           curl
           gawk
-          git
+          gitMinimal
           gnused
           nodejs
           wget
@@ -151,7 +145,6 @@ in {
           attic-client
           nix
           openssh
-          sudo
         ];
       };
     };

machines/wheatly.nix

@@ -25,7 +25,7 @@ Notes:
   };
 in {
   imports = [
-    # ../applications/git/gitlab_runner.nix
+    ../applications/git/gitlab_runner.nix
     ../applications/git/forgejo_runner.nix
   ];
 
@@ -41,10 +41,10 @@ in {
     host = host;
     backup.enable = true;
 
-    #    gitlab_runner = {
-    #      enable = true;
-    #      runner.name = "runner01";
-    #    };
+    gitlab_runner = {
+      enable = true;
+      runner.name = "runner01";
+    };
 
     forgejo_runner.enable = true;
   };