From 59ac31e13e3aefb33d653225cf8eb0dc15b7cc10 Mon Sep 17 00:00:00 2001
From: admin <admin@admins-Air.home.arpa>
Date: Sun, 1 Mar 2026 22:59:42 +0000
Subject: [PATCH] bluh

---
 home/podman.nix           | 135 +++++++-------------------------------
 hosts/server/settings.nix | 106 +++++++++++++++++++++++++++---
 2 files changed, 120 insertions(+), 121 deletions(-)

diff --git a/home/podman.nix b/home/podman.nix
index 5c5b511..0ff5140 100644
--- a/home/podman.nix
+++ b/home/podman.nix
@@ -200,29 +200,6 @@
       };
     };
 
-    gitea = {
-      image = "docker.gitea.com/gitea:1.23.7";
-      autoStart = true;
-      autoUpdate = "registry";
-      network = "bridge";
-      environmentFile = [
-        "/pool/services/secrets/default"
-        "/pool/services/secrets/gitea"
-      ];
-      volumes = [
-        "/pool/services/podman/gitea:/data"
-      ];
-      ports = [
-        "3001:3000"
-        "222:22"
-      ];
-      extraConfig = {
-        Service = {
-          TimeoutStartSec = 900;
-        };
-      };
-    };
-
     gitea-anubis = {
       image = "ghcr.io/techarohq/anubis:latest";
       autoStart = true;
@@ -300,6 +277,29 @@
       };
     };
 
+    hugo = {
+      image = "docker.io/hugomods/hugo:latest";
+      autoStart = true;
+      autoUpdate = "registry";
+      exec = "server -s /src/mektem.com -D";
+      network = "bridge";
+      environmentFile = [
+        "/pool/services/secrets/default"
+      ];
+      volumes = [
+        "/pool/services/podman/hugo/src:/src"
+        "/pool/services/podman/hugo/cache:/tmp/hugo_cache"
+      ];
+      ports = [
+        "1313:1313"
+      ];
+       extraConfig = {
+         Service = {
+           TimeoutStartSec = 900;
+         };
+       };
+    };
+
     immich-db = {
       image = "docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:739cdd626151ff1f796dc95a6591b55a714f341c737e27f045019ceabf8e8c52";
       autoStart = true;
@@ -609,28 +609,6 @@
 #      };
 #    };
 
-    matrix = {
-      image = "ghcr.io/element-hq/synapse";
-      autoStart = true;
-      autoUpdate = "registry";
-      network = "bridge";
-      environmentFile = [
-        "/pool/services/secrets/default"
-        "/pool/services/secrets/synapse"
-      ];
-      volumes = [
-        "/pool/services/podman/synapse:/data"
-      ];
-      ports = [
-        "8008:8008"
-        "8448:8448"
-      ];
-      extraConfig = {
-        Service = {
-          TimeoutStartSec = 900;
-        };
-      };
-    };
 
     metube = {
       image = "ghcr.io/alexta69/metube:latest";
@@ -712,29 +690,6 @@
     #  };
     #};
 
-    ntfy = {
-      image = "docker.io/binwiederhier/ntfy";
-      autoStart = true;
-      autoUpdate = "registry";
-      network = "bridge";
-      exec = "serve";
-      environmentFile = [
-        "/pool/services/secrets/default"
-        "/pool/services/secrets/ntfy"
-      ];
-      volumes = [
-        "/pool/services/podman/ntfy:/var/lib/ntfy"
-      ];
-      ports = [
-        "81:80"
-      ];
-      extraConfig = {
-        Service = {
-          TimeoutStartSec = 900;
-        };
-      };
-    };
-
     ntp = {
       image = "docker.io/cturra/ntp";
       autoStart = true;
@@ -863,27 +818,6 @@
       };
     };
 
-    privatebin = {
-      image = "docker.io/privatebin/nginx-fpm-alpine:latest";
-      autoStart = true;
-      autoUpdate = "registry";
-      network = "bridge";
-      environmentFile = [
-        "/pool/services/secrets/default"
-      ];
-      volumes = [
-        "/pool/media/privatebin:/srv/data"
-      ];
-      ports = [
-        "8082:8080"
-      ];
-      extraConfig = {
-        Service = {
-          TimeoutStartSec = 900;
-        };
-      };
-    };
-
     prowlarr = {
       image = "lscr.io/linuxserver/prowlarr:latest";
       autoStart = true;
@@ -1220,29 +1154,6 @@
       };
     };
 
-    vaultwarden = {
-      image = "docker.io/vaultwarden/server:latest";
-      autoStart = true;
-      autoUpdate = "registry";
-      network = "bridge";
-      environmentFile = [
-        "/pool/services/secrets/default"
-        "/pool/services/secrets/vaultwarden"
-      ];
-      volumes = [
-        "/pool/services/podman/vaultwarden:/data/"
-      ];
-      ports = [
-        "8000:80"
-        "3012:3012"
-      ];
-      extraConfig = {
-        Service = {
-          TimeoutStartSec = 900;
-        };
-      };
-    };
-
     webdav = {
       image = "docker.io/bytemark/webdav:latest";
       autoStart = true;
diff --git a/hosts/server/settings.nix b/hosts/server/settings.nix
index 5c142a6..7d0b88b 100644
--- a/hosts/server/settings.nix
+++ b/hosts/server/settings.nix
@@ -233,7 +233,52 @@ systemd.services.podman-network-vlan50 = {
       #   };
       # };
     };
-    
+
+    gitea = {
+      image = "docker.gitea.com/gitea:1.23.7";
+      autoStart = true;
+      #autoUpdate = "registry";
+      networks = [ "vlan50" ];
+      environmentFiles = [
+        "/pool/services/secrets/default"
+        "/pool/services/secrets/gitea"
+      ];
+      volumes = [
+        "/pool/services/podman/gitea:/data"
+      ];
+      extraOptions = [
+        "--ip=192.168.50.32"
+      ];
+      # extraConfig = {
+      #   Service = {
+      #     TimeoutStartSec = 900;
+      #   };
+      # };
+    };
+
+
+    matrix = {
+      image = "ghcr.io/element-hq/synapse";
+      autoStart = true;
+      #autoUpdate = "registry";
+      networks = [ "vlan50" ];
+      environmentFiles = [
+        "/pool/services/secrets/default"
+        "/pool/services/secrets/synapse"
+      ];
+      volumes = [
+        "/pool/services/podman/synapse:/data"
+      ];
+      extraOptions = [
+        "--ip=192.168.50.33"
+      ];
+      # extraConfig = {
+      #   Service = {
+      #     TimeoutStartSec = 900;
+      #   };
+      # };
+    };
+
     nginx = {
       image = "docker.io/nginx:latest";
       autoStart = true;
@@ -248,7 +293,7 @@ systemd.services.podman-network-vlan50 = {
         "/pool/services/podman/hugo/src/mektem.com/public:/usr/share/nginx/html"
       ];
       extraOptions = [
-        "--ip=192.168.50.33"
+        "--ip=192.168.50.34"
       ];
       # extraConfig = {
       #   Service = {
@@ -257,21 +302,64 @@ systemd.services.podman-network-vlan50 = {
       # };
     };
 
-    hugo = {
-      image = "docker.io/hugomods/hugo:latest";
+    ntfy = {
+      image = "docker.io/binwiederhier/ntfy";
       autoStart = true;
       #autoUpdate = "registry";
-      networks = [ "vlan50_web" ];
-      cmd = "server -s /src/mektem.com -D";
+      networks = [ "vlan50" ];
+      exec = "serve";
       environmentFiles = [
         "/pool/services/secrets/default"
+        "/pool/services/secrets/ntfy"
+      ];
+      volumes = [
+        "/pool/services/podman/ntfy:/var/lib/ntfy"
+      ];
+      extraOptions = [
+        "--ip=192.168.50.35"
+      ];
+      # extraConfig = {
+      #   Service = {
+      #     TimeoutStartSec = 900;
+      #   };
+      # };
+    };
+
+    privatebin = {
+      image = "docker.io/privatebin/nginx-fpm-alpine:latest";
+      autoStart = true;
+      #autoUpdate = "registry";
+      networks = [ "vlan50" ];
+      environmentFile = [
+        "/pool/services/secrets/default"
       ];
       volumes = [
-        "/pool/services/podman/hugo/src:/src"
-        "/pool/services/podman/hugo/cache:/tmp/hugo_cache"
+        "/pool/media/privatebin:/srv/data"
       ];
       extraOptions = [
-        "--ip=192.168.50.32"
+        "--ip=192.168.50.36"
+      ];
+      # extraConfig = {
+      #   Service = {
+      #     TimeoutStartSec = 900;
+      #   };
+      # };
+    };
+
+    vaultwarden = {
+      image = "docker.io/vaultwarden/server:latest";
+      autoStart = true;
+      #autoUpdate = "registry";
+      networks = [ "vlan50" ];
+      environmentFile = [
+        "/pool/services/secrets/default"
+        "/pool/services/secrets/vaultwarden"
+      ];
+      volumes = [
+        "/pool/services/podman/vaultwarden:/data/"
+      ];
+      extraOptions = [
+        "--ip=192.168.50.37"
       ];
       # extraConfig = {
       #   Service = {