From 84e945f7e6f522a525a483fc716f6eb5260fe07f Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 14:57:37 -0500 Subject: [PATCH] feat: added comfy ui --- flake.lock | 162 +++++++++++++++++++-- flake.nix | 2 + modules/nixos/default.nix | 1 + modules/nixos/services/comfyui/default.nix | 23 +++ 4 files changed, 178 insertions(+), 10 deletions(-) create mode 100644 modules/nixos/services/comfyui/default.nix diff --git a/flake.lock b/flake.lock index 29e225c..c111c28 100755 --- a/flake.lock +++ b/flake.lock @@ -356,7 +356,24 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -1062,10 +1079,52 @@ "type": "github" } }, + "nix-comfyui": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1733961600, + "narHash": "sha256-kEM0Dck4K4dg9QYmdldy62av+XzsNz9XhfTAhtGWwzo=", + "owner": "dyscorv", + "repo": "nix-comfyui", + "rev": "cbd17e10b53dcf8fd9f5ba6f3c1ea1a550082659", + "type": "github" + }, + "original": { + "owner": "dyscorv", + "repo": "nix-comfyui", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nix-comfyui", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, @@ -1145,6 +1204,20 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1749143949, "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", @@ -1160,7 +1233,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1749285348, "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", @@ -1176,7 +1249,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1747312588, "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=", @@ -1198,7 +1271,7 @@ "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1749427072, @@ -1214,6 +1287,37 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "nix-comfyui", + "flake-utils" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nix-comfyui", + "nixpkgs" + ], + "systems": [ + "nix-comfyui", + "flake-utils", + "systems" + ], + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1731205797, + "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", + "type": "github" + }, + "original": { + "id": "poetry2nix", + "type": "indirect" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1334,12 +1438,13 @@ "lix-module": "lix-module", "ngipkgs": "ngipkgs", "niri": "niri", + "nix-comfyui": "nix-comfyui", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", - "systems": "systems_6", + "systems": "systems_7", "waybar": "waybar", "yazi": "yazi", "zed-editor": "zed-editor", @@ -1570,6 +1675,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1680978846, "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", @@ -1584,7 +1704,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1622,6 +1742,28 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nix-comfyui", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nur", @@ -1739,8 +1881,8 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 745401e..aace8d3 100755 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,7 @@ url = "gitlab:InvraNet/zen-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-comfyui.url = "github:dyscorv/nix-comfyui"; }; outputs = inputs: @@ -125,6 +126,7 @@ config.nixosModules.mantle inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default + inputs.nix-comfyui.nixosModules.default # inputs.ngipkgs.nixosModules."services.peertube" # inputs.ngipkgs.nixosModules.default inputs.sops-nix.nixosModules.sops diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 8228d2f..02b829c 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -64,6 +64,7 @@ in searx vaultwarden website + comfyui ; }; }; diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix new file mode 100644 index 0000000..e312c1f --- /dev/null +++ b/modules/nixos/services/comfyui/default.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: + +let + my-comfyui = pkgs.comfyuiPackages.comfyui.override { + extensions = [ + pkgs.comfyuiPackages.extensions.acly-inpaint + pkgs.comfyuiPackages.extensions.acly-tooling + pkgs.comfyuiPackages.extensions.cubiq-ipadapter-plus + pkgs.comfyuiPackages.extensions.fannovel16-controlnet-aux + ]; + + commandLineArgs = [ + "--preview-method" + "auto" + ]; + }; +in + +{ + environment.systemPackages = [ + my-comfyui + ]; +}