From fc064edeae954656a6e9d9cdeea8318729ea00ab Mon Sep 17 00:00:00 2001
From: nicknase27 <nick@nicknase27.com>
Date: Wed, 26 Aug 2026 12:29:48 +0200
Subject: [PATCH] clean up

---
 flake.lock                    |  6 +++---
 modules/services/caddy.nix    | 11 +++++++---
 modules/services/gitea.nix    | 38 +++++++++++++++++------------------
 modules/system/networking.nix |  5 ++---
 secrets/secrets.nix           |  2 +-
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/flake.lock b/flake.lock
index 29b86e7..ec81d20 100644
--- a/flake.lock
+++ b/flake.lock
@@ -104,11 +104,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1786599213,
-        "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=",
+        "lastModified": 1786862985,
+        "narHash": "sha256-FBJRXmbGXiSUDvYEbfLYRkckayyZ6SK1UEqhCrIZ2Cs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4",
+        "rev": "e5bdc4a41d4c072fe1e3787eaa0320a384741d44",
         "type": "github"
       },
       "original": {
diff --git a/modules/services/caddy.nix b/modules/services/caddy.nix
index 91f70d0..10c00cc 100644
--- a/modules/services/caddy.nix
+++ b/modules/services/caddy.nix
@@ -74,7 +74,7 @@
       };
       "jf.nicknase27.com" = {
         extraConfig = ''
-          reverse_proxy storage.local:8096
+          reverse_proxy 10.0.0.5:8096
         '';
         serverAliases = ["watch.nicknase27.com"];
       };
@@ -108,12 +108,17 @@
       };
       "storage.nicknase27.com" = {
         extraConfig = ''
-          reverse_proxy storage.local:80
+          reverse_proxy 10.0.0.5:80
         '';
       };
       "photos.nicknase27.com" = {
         extraConfig = ''
-          reverse_proxy storage.local:2283
+          reverse_proxy 10.0.0.5:2283
+        '';
+      };
+      "muse.nicknase27.com" = {
+        extraConfig = ''
+          reverse_proxy 10.0.0.5:30431
         '';
       };
     };
diff --git a/modules/services/gitea.nix b/modules/services/gitea.nix
index ee93b25..2e76af9 100644
--- a/modules/services/gitea.nix
+++ b/modules/services/gitea.nix
@@ -19,17 +19,17 @@
     };
 
     # Runner
-    gitea-actions-runner = {
-      instances.default = {
-        enable = true;
-        name = "hermes";
-        url = "https://git.nicknase27.com";
-        tokenFile = config.age.secrets.gitea-runner.path;
-        labels = [
-          "ubuntu-latest:docker://node:20-bookworm"
-        ];
-      };
-    };
+    # gitea-actions-runner = {
+    #   instances.default = {
+    #     enable = true;
+    #     name = "hermes";
+    #     url = "https://git.nicknase27.com";
+    #     tokenFile = config.age.secrets.gitea-runner.path;
+    #     labels = [
+    #       "ubuntu-latest:docker://node:20-bookworm"
+    #     ];
+    #   };
+    # };
   };
 
   age.secrets = {
@@ -39,14 +39,14 @@
       owner = "gitea";
       group = "gitea";
     };
-    gitea-runner = {
-      file = ../../secrets/gitea-runner.age;
-      path = "/run/secrets/gitea-runner";
-      owner = "gitea-runner";
-      group = "gitea-runner";
-    };
+    # gitea-runner = {
+    #   file = ../../secrets/gitea-runner.age;
+    #   path = "/run/secrets/gitea-runner";
+    #   owner = "gitea-runner";
+    #   group = "gitea-runner";
+    # };
   };
   networking.firewall = {
-      allowedTCPPorts = [3000];
-    };
+    allowedTCPPorts = [3000];
+  };
 }
diff --git a/modules/system/networking.nix b/modules/system/networking.nix
index 93cbe89..251dab2 100644
--- a/modules/system/networking.nix
+++ b/modules/system/networking.nix
@@ -1,11 +1,10 @@
 {...}: {
   networking = {
     hostName = "Hermes";
-    #nameservers = ["1.1.1.1" "1.0.0.1"];
-    nameservers = ["10.0.0.1"];
+    nameservers = ["1.1.1.1" "1.0.0.1"];
     firewall = {
       enable = true;
-      trustedInterfaces = ["podman0"];
+      trustedInterfaces = ["podman0" "docker0" "cni-podman0"];
     };
     nftables = {
       enable = true;
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 0331715..63aee78 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -12,7 +12,7 @@ in {
   "livekit-keys.age".publicKeys = systems;
   "truenas-ssh.age".publicKeys = systems;
   "gitea-db.age".publicKeys = systems;
-  "gitea-runner.age".publicKeys = systems;
+  # "gitea-runner.age".publicKeys = systems;
   "navidrome.age".publicKeys = systems;
   "vaultwarden.age".publicKeys = systems;
   "wg0.age".publicKeys = systems;