From 91dc80922e715a92473a46a4851fc22f9151f4b7 Mon Sep 17 00:00:00 2001
From: "Gustavo \"Guz\" L de Mello" <contact@guz.one>
Date: Sat, 13 Sep 2025 22:08:55 -0300
Subject: [PATCH] refactor: move caddy and cloudflare to common folder

---
 capytal/default.nix   | 21 ---------------------
 common/caddy.nix      |  6 ++++++
 common/cloudflare.nix | 17 +++++++++++++++++
 common/default.nix    |  2 ++
 4 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 common/caddy.nix
 create mode 100644 common/cloudflare.nix

diff --git a/capytal/default.nix b/capytal/default.nix
index add774b..51bffcf 100644
--- a/capytal/default.nix
+++ b/capytal/default.nix
@@ -4,25 +4,4 @@
     ./forgejo.nix
     ./websites.nix
   ];
-
-  services.caddy.enable = true;
-
-  virtualisation.oci-containers.containers.cloudflare-tunnel = {
-    image = "cloudflare/cloudflared:latest";
-    autoStart = true;
-    extraOptions = [
-      "--network=host"
-    ];
-    cmd = [
-      "tunnel"
-      "--no-autoupdate"
-      "run"
-    ];
-    environmentFiles = [
-      config.sops.secrets."cloudflared/tunnel-env".path
-    ];
-  };
-
-  # Caddy Ports
-  networking.firewall.allowedTCPPorts = [80 433];
 }
diff --git a/common/caddy.nix b/common/caddy.nix
new file mode 100644
index 0000000..7616fb6
--- /dev/null
+++ b/common/caddy.nix
@@ -0,0 +1,6 @@
+{...}: {
+  services.caddy.enable = true;
+
+  # Caddy Ports
+  networking.firewall.allowedTCPPorts = [80 433];
+}
diff --git a/common/cloudflare.nix b/common/cloudflare.nix
new file mode 100644
index 0000000..b3772ae
--- /dev/null
+++ b/common/cloudflare.nix
@@ -0,0 +1,17 @@
+{config, ...}: {
+  virtualisation.oci-containers.containers.cloudflare-tunnel = {
+    image = "cloudflare/cloudflared:latest";
+    autoStart = true;
+    extraOptions = [
+      "--network=host"
+    ];
+    cmd = [
+      "tunnel"
+      "--no-autoupdate"
+      "run"
+    ];
+    environmentFiles = [
+      config.sops.secrets."cloudflared/tunnel-env".path
+    ];
+  };
+}
diff --git a/common/default.nix b/common/default.nix
index b7af5c0..839ed44 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -1,5 +1,7 @@
 {...}: {
   imports = [
     ./tailscale.nix
+    ./caddy.nix
+    ./cloudflare.nix
   ];
 }