From 9983854936950f64a680f53713560da65fa645d0 Mon Sep 17 00:00:00 2001
From: Lucy Hochkamp <git@xyno.systems>
Date: Wed, 3 Sep 2025 22:30:27 +0200
Subject: [PATCH] meow

---
 hosts/ds9/containers.nix                      | 22 +++++++++----------
 hosts/ds9/default.nix                         |  4 ++++
 hosts/ds9/ytdl-sub.nix                        |  1 +
 nixos-modules/services/caddy/custom-caddy.nix |  4 ++--
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/hosts/ds9/containers.nix b/hosts/ds9/containers.nix
index 7d1abb1d..297cbf21 100644
--- a/hosts/ds9/containers.nix
+++ b/hosts/ds9/containers.nix
@@ -76,7 +76,7 @@ in
       "--health-cmd"
       "pg_isready -U postgres"
     ];
-    dependsOn = [ "db-network" ];
+    # dependsOn = [ "db-network" ];
     environment = {
       POSTGRES_INITDB_ARGS = "--data-checksums";
     };
@@ -91,13 +91,13 @@ in
   };
   # immich
   ragon.agenix.secrets.ds9ImmichEnv = { };
-  systemd.services."podman-immich-network" = {
-    script = ''
-      echo "Creating immich network"
-      ${pkgs.podman}/bin/podman network exists immich-net || ${pkgs.podman}/bin/podman network create immich-net --internal --ipv6
-      echo "Created immich network"
-    '';
-  };
+  # systemd.services."podman-immich-network" = {
+  #   script = ''
+  #     echo "Creating immich network"
+  #     ${pkgs.podman}/bin/podman network exists immich-net || ${pkgs.podman}/bin/podman network create immich-net --internal --ipv6
+  #     echo "Created immich network"
+  #   '';
+  # };
   virtualisation.oci-containers.containers.immich-redis = {
     image = "docker.io/valkey/valkey:7.2.6-alpine";
     environment.TZ = "Europe/Berlin";
@@ -109,7 +109,7 @@ in
     environmentFiles = [
       config.age.secrets.ds9ImmichEnv.path
     ];
-    dependsOn = [ "immich-network" ];
+    # dependsOn = [ "immich-network" ];
   };
   virtualisation.oci-containers.containers.immich-server = {
     user = "1000:100";
@@ -120,7 +120,7 @@ in
       "--network=db-net"
     ];
     dependsOn = [
-      "immich-network"
+      # "immich-network"
       "immich-redis"
       "postgres"
     ];
@@ -147,7 +147,7 @@ in
       "--network=podman"
     ];
     dependsOn = [
-      "immich-network"
+      # "immich-network"
       "immich-redis"
       "postgres"
     ];
diff --git a/hosts/ds9/default.nix b/hosts/ds9/default.nix
index 24165835..f298f354 100644
--- a/hosts/ds9/default.nix
+++ b/hosts/ds9/default.nix
@@ -225,6 +225,10 @@ in
       output file ${config.services.caddy.logDir}/access-*hailsatan.eu_internet.log
     '';
     virtualHosts."*.hailsatan.eu ".extraConfig = ''
+      @vanitygpg host vanitygpg.hailsatan.eu
+      handle @vanitygpg {
+        reverse_proxy h2c://[::1]:29328
+      }
       import blockBots
       @jellyfin host j.hailsatan.eu
       handle @jellyfin {
diff --git a/hosts/ds9/ytdl-sub.nix b/hosts/ds9/ytdl-sub.nix
index c0bbf5d7..8f45aa22 100644
--- a/hosts/ds9/ytdl-sub.nix
+++ b/hosts/ds9/ytdl-sub.nix
@@ -119,6 +119,7 @@ in
           "~Murder Drones" = {
             s01_url = "https://www.youtube.com/playlist?list=PLHovnlOusNLiJz3sm0d5i2Evwa2LDLdrg";
             tv_show_collection_episode_ordering = "playlist-index";
+            tv_show_directory = "/data/media/yt";
           };
         };
       };
diff --git a/nixos-modules/services/caddy/custom-caddy.nix b/nixos-modules/services/caddy/custom-caddy.nix
index 6b5d0ef2..34888354 100644
--- a/nixos-modules/services/caddy/custom-caddy.nix
+++ b/nixos-modules/services/caddy/custom-caddy.nix
@@ -3,7 +3,7 @@
 with pkgs;
 
 caddy.override {
-  buildGoModule = args: buildGoModule (args // {
+  buildGo125Module = args: buildGo125Module (args // {
     src = stdenv.mkDerivation rec {
       pname = "caddy-using-xcaddy-${xcaddy.version}";
       inherit (caddy) version;
@@ -37,7 +37,7 @@ caddy.override {
         cp -r --reflink=auto . $out
       '';
 
-      outputHash = "sha256-r4+WK8UhGLAuIvdV6uiH2bMh/SjTfY4CzKcpHU0Gu5s=";
+      outputHash = "sha256-a2GeG7TYBnCz30jBKQmmQz8Y3vutRpa+tboaahJ5xeQ=";
       outputHashMode = "recursive";
     };