From 09a546cf7cb5756be7a36b3cbb1fa9b546a0c78c Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Sun, 27 Jul 2025 18:22:08 -0500
Subject: [PATCH] feat: added comfyui to caddy

---
 modules/nixos/services/prompter/default.nix |  4 +++-
 systems/ceres/config/comfyui.nix            | 18 ++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/modules/nixos/services/prompter/default.nix b/modules/nixos/services/prompter/default.nix
index af01775..f822cf6 100644
--- a/modules/nixos/services/prompter/default.nix
+++ b/modules/nixos/services/prompter/default.nix
@@ -9,11 +9,13 @@ in
 {
   services = {
     caddy = {
+      environmentFile = config.sops.secrets."caddy/${service.name}-auth".path;
+
       virtualHosts = {
         "${host}" = {
           extraConfig = ''
             basicauth {
-              import ${config.sops.secrets."caddy/${service.name}-auth".path}
+              {$CADDY_AUTH_USER} {$CADDY_AUTH_PASSWORD_HASH}
             }
             root * ${service.paths.path0}
             file_server
diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 2588aef..5354f71 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -35,12 +35,11 @@ in
       };
     };
     caddy = {
-
       virtualHosts = {
         "${host}" = {
           extraConfig = ''
             basicauth {
-              import ${config.sops.secrets."caddy/${service.name}-auth".path}
+              {$CADDY_AUTH_USER} {$CADDY_AUTH_PASSWORD_HASH}
             }
 
             reverse_proxy ${localhost}:${toString service.ports.port0}
@@ -52,26 +51,13 @@ in
     };
   };
 
-  sops =
-    let
-      sopsPath = secret: {
-        path = "${service.sops.path0}/${service.name}-${secret}.env";
-        owner = "caddy";
-        mode = "0400";
-      };
-    in
-    {
-      secrets = {
-        "caddy/${service.name}-auth" = sopsPath "auth";
-      };
-    };
-
   systemd.tmpfiles.rules = [
     "Z ${service.sops.path0} 755 caddy caddy -"
   ];
 
   users.users.${service.name}.extraGroups = [
     "users"
+    "caddy"
   ];
 
   networking = {