From ad46eb654601ec031f263cfceb5d14282fc226a4 Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Sat, 8 Mar 2025 10:57:28 +0000
Subject: [PATCH] Clean up podman networks

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 .../console/podman/authelia/default.nix       |  2 +-
 .../configs/console/podman/ntfy/default.nix   |  7 ++++-
 .../console/podman/traefik/default.nix        |  6 +----
 .../configs/console/podman/whoami/default.nix | 27 ++++++++++++-------
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix b/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix
index 147472f..69a8709 100644
--- a/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix
+++ b/hosts/jupiter/users/storm/configs/console/podman/authelia/default.nix
@@ -48,7 +48,7 @@ in
     };
 
     virtualisation.quadlet = {
-      networks.authelia = { };
+      networks.authelia.networkConfig.internal = true;
 
       volumes."authelia-redis" = { };
 
diff --git a/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix b/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix
index ece739a..278c784 100644
--- a/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix
+++ b/hosts/jupiter/users/storm/configs/console/podman/ntfy/default.nix
@@ -102,13 +102,18 @@ in
     };
 
     virtualisation.quadlet = {
+      networks.ntfy.networkConfig.internal = true;
+
       volumes.ntfy = { };
 
       containers.ntfy = {
         containerConfig = {
           autoUpdate = "registry";
           image = "docker.io/binwiederhier/ntfy:latest";
-          networks = [ networks.traefik.ref ];
+          networks = [
+            networks.ntfy.ref
+            networks.traefik.ref
+          ];
           volumes = [
             "${volumes.ntfy.ref}:/var/lib/ntfy"
             "${hmConfig.sops.templates."ntfy-server.yml".path}:/etc/ntfy/server.yml:ro"
diff --git a/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix b/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix
index 3909401..8a59236 100644
--- a/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix
+++ b/hosts/jupiter/users/storm/configs/console/podman/traefik/default.nix
@@ -24,11 +24,7 @@ in
     };
 
     virtualisation.quadlet = {
-      networks.traefik.networkConfig = {
-        internal = true;
-        subnets = [ "10.89.0.0/16" ];
-        gateways = [ "10.89.0.1" ];
-      };
+      networks.traefik = { };
 
       volumes.letsencrypt.volumeConfig = { };
 
diff --git a/hosts/jupiter/users/storm/configs/console/podman/whoami/default.nix b/hosts/jupiter/users/storm/configs/console/podman/whoami/default.nix
index 2f230a9..8f40345 100644
--- a/hosts/jupiter/users/storm/configs/console/podman/whoami/default.nix
+++ b/hosts/jupiter/users/storm/configs/console/podman/whoami/default.nix
@@ -8,15 +8,22 @@ let
   inherit (hmConfig.virtualisation.quadlet) networks;
 in
 {
-  home-manager.users.${user}.virtualisation.quadlet.containers.whoami.containerConfig = {
-    autoUpdate = "registry";
-    image = "docker.io/traefik/whoami:latest";
-    networks = [ networks.traefik.ref ];
-    labels = [
-      "traefik.enable=true"
-      "traefik.http.routers.whoami.rule=Host(`whoami.karaolidis.com`)"
-      "traefik.http.routers.whoami.entrypoints=websecure"
-      "traefik.http.routers.whoami.tls.certresolver=letsencrypt"
-    ];
+  home-manager.users.${user}.virtualisation.quadlet = {
+    networks.whoami.networkConfig.internal = true;
+
+    containers.whoami.containerConfig = {
+      autoUpdate = "registry";
+      image = "docker.io/traefik/whoami:latest";
+      networks = [
+        networks.whoami.ref
+        networks.traefik.ref
+      ];
+      labels = [
+        "traefik.enable=true"
+        "traefik.http.routers.whoami.rule=Host(`whoami.karaolidis.com`)"
+        "traefik.http.routers.whoami.entrypoints=websecure"
+        "traefik.http.routers.whoami.tls.certresolver=letsencrypt"
+      ];
+    };
   };
 }