From c2e4f80364c772240da85fa6c32034d994e3b56e Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Fri, 18 Apr 2025 02:39:41 +0100
Subject: [PATCH] Migrate forgejo to nixedo

---
 hosts/hetznix/services/default.nix |  1 -
 hosts/hetznix/services/forgejo.nix | 30 ----------------------
 hosts/nixedo/modules/forgejo.nix   | 40 ++++++++++++------------------
 3 files changed, 16 insertions(+), 55 deletions(-)
 delete mode 100644 hosts/hetznix/services/forgejo.nix

diff --git a/hosts/hetznix/services/default.nix b/hosts/hetznix/services/default.nix
index 35838ce0..2e3779b0 100644
--- a/hosts/hetznix/services/default.nix
+++ b/hosts/hetznix/services/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./caddy
-    ./forgejo.nix
     ./jitsi.nix
     ./openssl.nix
   ];
diff --git a/hosts/hetznix/services/forgejo.nix b/hosts/hetznix/services/forgejo.nix
deleted file mode 100644
index 477af67e..00000000
--- a/hosts/hetznix/services/forgejo.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, ... }:
-
-{
-  services = {
-    forgejo = {
-      enable = true;
-
-      settings = {
-        server = {
-          DOMAIN = "code.oliverdavies.uk";
-          HTTP_PORT = 2223;
-          ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}";
-          SSH_DOMAIN = "ssh.oliverdavies.uk";
-        };
-
-        service = {
-          DISABLE_REGISTRATION = true;
-        };
-      };
-    };
-
-    caddy.virtualHosts."${config.services.forgejo.settings.server.DOMAIN}" = {
-      useACMEHost = "oliverdavies.uk";
-
-      extraConfig = "reverse_proxy localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}";
-    };
-
-    openssh.settings.AllowUsers = [ "forgejo" ];
-  };
-}
diff --git a/hosts/nixedo/modules/forgejo.nix b/hosts/nixedo/modules/forgejo.nix
index cb9dc933..501b6147 100644
--- a/hosts/nixedo/modules/forgejo.nix
+++ b/hosts/nixedo/modules/forgejo.nix
@@ -1,34 +1,26 @@
-{ config, lib, ... }:
-
-with lib;
+{ config, ... }:
 
 {
-  options.nixosModules.forgejo.enable = mkEnableOption "Enable forgejo";
+  services = {
+    forgejo = {
+      enable = true;
+      stateDir = "/var/www/forgejo";
 
-  config = mkIf config.nixosModules.forgejo.enable {
-    services = {
-      forgejo = {
-        enable = true;
-        group = "media";
-        stateDir = "/mnt/media/forgejo";
+      settings = {
+        server = {
+          DOMAIN = "code.oliverdavies.uk";
+          HTTP_PORT = 2223;
+        };
 
-        settings = {
-          server = {
-            DOMAIN = "forgejo.oliverdavies.uk";
-            HTTP_PORT = 2223;
-          };
-
-          service = {
-            DISABLE_REGISTRATION = true;
-          };
+        service = {
+          DISABLE_REGISTRATION = true;
         };
       };
+    };
 
-      caddy.virtualHosts."${config.services.forgejo.settings.server.DOMAIN}" = {
-        useACMEHost = "oliverdavies.uk";
-
-        extraConfig = "reverse_proxy localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}";
-      };
+    cloudflared.tunnels."e1514105-327f-4984-974e-e2fbaca76466".ingress = {
+      "code.oliverdavies.uk" =
+        "http://localhost:${toString config.services.forgejo.settings.server.HTTP_PORT}";
     };
   };
 }