From e89d7b75dec5365436bbc9b995082db0c97c37d4 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 16:21:16 -0500
Subject: [PATCH 01/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 19ed901..503dbde 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -53,11 +53,9 @@ in
       };
     };
   };
+
   systemd.tmpfiles.rules = [
     "Z ${service.sops.path0} 755 caddy caddy -"
-    "d ${service.paths.path0}/custom_nodes 0755 ${service.name} ${service.name} -"
-    "r ${config.services.comfyui.package}/custom_nodes"
-    "L+ ${config.services.comfyui.package}/custom_nodes - - - - ${service.paths.path0}/custom_nodes"
   ];
 
   users.users.${service.name}.extraGroups = [

From 09746f6f7d4ec04d1f7391273b29a775bf863d7e Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 16:33:49 -0500
Subject: [PATCH 02/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 503dbde..6837a84 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -21,21 +21,21 @@ in
       enable = true;
       openFirewall = true;
       host = localhost;
-      package = pkgs.comfyuiPackages.comfyui.override {
-        extensions = with pkgs.comfyuiPackages.extensions; [
-          acly-inpaint
-          acly-tooling
-          kosinkadink-advanced-controlnet
-          kosinkadink-animatediff-evolved
-          kosinkadink-video-helper-suite
-          lev145-images-grid
-          ssitu-ultimate-sd-upscale
-        ];
-        commandLineArgs = [
-          "--preview-method"
-          "auto"
-        ];
-      };
+      # package = pkgs.comfyuiPackages.comfyui.override {
+      #   extensions = with pkgs.comfyuiPackages.extensions; [
+      #     acly-inpaint
+      #     acly-tooling
+      #     kosinkadink-advanced-controlnet
+      #     kosinkadink-animatediff-evolved
+      #     kosinkadink-video-helper-suite
+      #     lev145-images-grid
+      #     ssitu-ultimate-sd-upscale
+      #   ];
+      #   commandLineArgs = [
+      #     "--preview-method"
+      #     "auto"
+      #   ];
+      # };
     };
     caddy = {
       virtualHosts = {

From c9f3d66cdfafac789f04a5ed6e2c8809a20d63c8 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 16:35:35 -0500
Subject: [PATCH 03/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 6837a84..503dbde 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -21,21 +21,21 @@ in
       enable = true;
       openFirewall = true;
       host = localhost;
-      # package = pkgs.comfyuiPackages.comfyui.override {
-      #   extensions = with pkgs.comfyuiPackages.extensions; [
-      #     acly-inpaint
-      #     acly-tooling
-      #     kosinkadink-advanced-controlnet
-      #     kosinkadink-animatediff-evolved
-      #     kosinkadink-video-helper-suite
-      #     lev145-images-grid
-      #     ssitu-ultimate-sd-upscale
-      #   ];
-      #   commandLineArgs = [
-      #     "--preview-method"
-      #     "auto"
-      #   ];
-      # };
+      package = pkgs.comfyuiPackages.comfyui.override {
+        extensions = with pkgs.comfyuiPackages.extensions; [
+          acly-inpaint
+          acly-tooling
+          kosinkadink-advanced-controlnet
+          kosinkadink-animatediff-evolved
+          kosinkadink-video-helper-suite
+          lev145-images-grid
+          ssitu-ultimate-sd-upscale
+        ];
+        commandLineArgs = [
+          "--preview-method"
+          "auto"
+        ];
+      };
     };
     caddy = {
       virtualHosts = {

From 006fb3ac28f1a61a81b5705b4a529b72a185a0f8 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 16:42:30 -0500
Subject: [PATCH 04/10] feat: comfyui-test

---
 modules/nixos/services/forgejo/default.nix |  4 +---
 systems/ceres/config/comfyui.nix           | 12 ++++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/nixos/services/forgejo/default.nix b/modules/nixos/services/forgejo/default.nix
index 3673b71..82a796f 100755
--- a/modules/nixos/services/forgejo/default.nix
+++ b/modules/nixos/services/forgejo/default.nix
@@ -4,9 +4,7 @@
   ...
 }:
 let
-  inherit (flake.config.machines.devices)
-    ceres
-    ;
+  inherit (flake.config.machines.devices) ceres;
   inherit (flake.config.services.instances) smtp forgejo web;
   service = forgejo;
   localhost = web.localhost.address0;
diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 503dbde..675e1ab 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -6,6 +6,7 @@
 }:
 
 let
+  inherit (flake.config.machines.devices) ceres;
   inherit (flake.config.services.instances) comfyui web;
   service = comfyui;
   localhost = web.localhost.address1;
@@ -54,7 +55,18 @@ in
     };
   };
 
+  fileSystems."/var/lib/${service.name}" = {
+    device = service.paths.path0;
+    fsType = "none";
+    options = [
+      "bind"
+    ];
+    depends = [
+      ceres.storage0.mount
+    ];
+  };
   systemd.tmpfiles.rules = [
+    "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
     "Z ${service.sops.path0} 755 caddy caddy -"
   ];
 

From 0e9fdb2aeb31355441eb719e18050d9a4eaf32c4 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 16:49:42 -0500
Subject: [PATCH 05/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 675e1ab..579e2c2 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -55,18 +55,18 @@ in
     };
   };
 
-  fileSystems."/var/lib/${service.name}" = {
-    device = service.paths.path0;
-    fsType = "none";
-    options = [
-      "bind"
-    ];
-    depends = [
-      ceres.storage0.mount
-    ];
-  };
+  # fileSystems."/var/lib/${service.name}" = {
+  #   device = service.paths.path0;
+  #   fsType = "none";
+  #   options = [
+  #     "bind"
+  #   ];
+  #   depends = [
+  #     ceres.storage0.mount
+  #   ];
+  # };
   systemd.tmpfiles.rules = [
-    "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
+    # "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
     "Z ${service.sops.path0} 755 caddy caddy -"
   ];
 

From a3abcf8293bb06054b58bb440b326c8c9e46402e Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 17:03:20 -0500
Subject: [PATCH 06/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 579e2c2..675e1ab 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -55,18 +55,18 @@ in
     };
   };
 
-  # fileSystems."/var/lib/${service.name}" = {
-  #   device = service.paths.path0;
-  #   fsType = "none";
-  #   options = [
-  #     "bind"
-  #   ];
-  #   depends = [
-  #     ceres.storage0.mount
-  #   ];
-  # };
+  fileSystems."/var/lib/${service.name}" = {
+    device = service.paths.path0;
+    fsType = "none";
+    options = [
+      "bind"
+    ];
+    depends = [
+      ceres.storage0.mount
+    ];
+  };
   systemd.tmpfiles.rules = [
-    # "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
+    "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
     "Z ${service.sops.path0} 755 caddy caddy -"
   ];
 

From 41f69228a98a747dab7e8053c74afaf676d42b04 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 17:07:12 -0500
Subject: [PATCH 07/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 675e1ab..ccbdff3 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -66,7 +66,7 @@ in
     ];
   };
   systemd.tmpfiles.rules = [
-    "Z ${service.paths.path0} 755 ${service.name} ${service.name} -"
+    "Z ${service.paths.path0} 755 root root -"
     "Z ${service.sops.path0} 755 caddy caddy -"
   ];
 

From cbb131af43f0fb76686395fe96da4a1a5a65311d Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 17:11:19 -0500
Subject: [PATCH 08/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index ccbdff3..229ad46 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -56,7 +56,7 @@ in
   };
 
   fileSystems."/var/lib/${service.name}" = {
-    device = service.paths.path0;
+    device = "${service.paths.path0}/models";
     fsType = "none";
     options = [
       "bind"
@@ -67,7 +67,7 @@ in
   };
   systemd.tmpfiles.rules = [
     "Z ${service.paths.path0} 755 root root -"
-    "Z ${service.sops.path0} 755 caddy caddy -"
+    "Z ${service.sops.path0}/models 755 ${service.name} ${service.name} -"
   ];
 
   users.users.${service.name}.extraGroups = [

From e3d9390610030e820d594a2743a976d2814d8a9d Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 17:16:17 -0500
Subject: [PATCH 09/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index 229ad46..a531d16 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -55,7 +55,7 @@ in
     };
   };
 
-  fileSystems."/var/lib/${service.name}" = {
+  fileSystems."/var/lib/${service.name}/models" = {
     device = "${service.paths.path0}/models";
     fsType = "none";
     options = [

From b01f84b5d32271853f69adee5c51961ee0330448 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 29 Jul 2025 17:19:02 -0500
Subject: [PATCH 10/10] feat: comfyui-test

---
 systems/ceres/config/comfyui.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix
index a531d16..4a8a209 100755
--- a/systems/ceres/config/comfyui.nix
+++ b/systems/ceres/config/comfyui.nix
@@ -66,8 +66,8 @@ in
     ];
   };
   systemd.tmpfiles.rules = [
-    "Z ${service.paths.path0} 755 root root -"
-    "Z ${service.sops.path0}/models 755 ${service.name} ${service.name} -"
+    "Z ${service.paths.path0}/models 755 root root -"
+    "Z ${service.sops.path0} 755 caddy caddy -"
   ];
 
   users.users.${service.name}.extraGroups = [