diff --git a/flake.lock b/flake.lock index c111c28..850dbc4 100755 --- a/flake.lock +++ b/flake.lock @@ -277,6 +277,48 @@ } }, "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nixified-ai", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nixified-ai", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nur", @@ -356,24 +398,7 @@ }, "flake-utils_4": { "inputs": { - "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" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -539,6 +564,28 @@ "type": "github" } }, + "hercules-ci-effects_2": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": [ + "nixified-ai", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -1079,45 +1126,23 @@ "type": "github" } }, - "nix-comfyui": { + "nixified-ai": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3", - "poetry2nix": "poetry2nix" + "flake-parts": "flake-parts_3", + "hercules-ci-effects": "hercules-ci-effects_2", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733961600, - "narHash": "sha256-kEM0Dck4K4dg9QYmdldy62av+XzsNz9XhfTAhtGWwzo=", - "owner": "dyscorv", - "repo": "nix-comfyui", - "rev": "cbd17e10b53dcf8fd9f5ba6f3c1ea1a550082659", + "lastModified": 1747142274, + "narHash": "sha256-5WuEIrM4yTSMMoxJHQ9RBwO0liBE9KcCldyiBfcYIHU=", + "owner": "nixified-ai", + "repo": "flake", + "rev": "ba83e9b493f5fd278abe8ee91040323296da3f39", "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", + "owner": "nixified-ai", + "repo": "flake", "type": "github" } }, @@ -1205,16 +1230,18 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733749988, - "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { @@ -1267,11 +1294,11 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix_3" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1749427072, @@ -1287,37 +1314,6 @@ "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", @@ -1438,13 +1434,13 @@ "lix-module": "lix-module", "ngipkgs": "ngipkgs", "niri": "niri", - "nix-comfyui": "nix-comfyui", + "nixified-ai": "nixified-ai", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_5", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", - "systems": "systems_7", + "systems": "systems_6", "waybar": "waybar", "yazi": "yazi", "zed-editor": "zed-editor", @@ -1675,21 +1671,6 @@ } }, "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=", @@ -1704,7 +1685,7 @@ "type": "github" } }, - "systems_8": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1742,28 +1723,6 @@ } }, "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", @@ -1881,7 +1840,7 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_3" }, diff --git a/flake.nix b/flake.nix index 3dc0d8e..fb166fa 100755 --- a/flake.nix +++ b/flake.nix @@ -62,7 +62,7 @@ url = "gitlab:InvraNet/zen-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-comfyui.url = "github:dyscorv/nix-comfyui"; + nixified-ai.url = "github:nixified-ai/flake"; }; outputs = inputs: @@ -129,6 +129,7 @@ # inputs.ngipkgs.nixosModules."services.peertube" # inputs.ngipkgs.nixosModules.default inputs.sops-nix.nixosModules.sops + inputs.nixified-ai.nixosModules.comfyui ]; }; templates = { diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix old mode 100644 new mode 100755 index 90cb702..cb8615a --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -1,90 +1,56 @@ { config, - lib, pkgs, flake, ... }: - let + inherit (flake.config.machines.devices) ceres; + inherit (flake.config.services.instances) comfyui web; inherit (flake.config.people) user0; - cfg = config.services.comfyui; + service = comfyui; + localhost = web.localhost.address1; in { - imports = [ ]; - options = { - services.comfyui = with lib; { - enable = mkEnableOption "ComfyUI service"; - - package = mkOption { - type = types.package; - default = pkgs.comfyuiPackages.comfyui.override { - extensions = with pkgs.comfyuiPackages.extensions; [ - # Add desired extensions here - # Example extensions: - # acly-inpaint - # acly-tooling - # cubiq-ipadapter-plus - # fannovel16-controlnet-aux - ]; - commandLineArgs = [ - "--preview-method" - "auto" - ]; - }; - description = "The ComfyUI package to use"; - }; - - port = mkOption { - type = types.port; - default = 8188; - description = "Port to listen on"; - }; - - host = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Host to bind to"; - }; - - openFirewall = mkOption { - type = types.bool; - default = false; - description = "Open ports in the firewall"; - }; - }; + services.comfyui = { + enable = true; + # package = pkgs.comfyui-nvidia; + host = localhost; + user = service.name; + acceleration = "cuda"; + # models = builtins.attrValues { + # inherit (pkgs.nixified-ai) + # models + # ; + # }; + # customNodes = builtins.attrValues { + # inherit (comfyui.pkgs) + # comfyui-gguf + # comfyui-impact-pack + # ; + # }; + }; + fileSystems."/var/lib/${service.name}" = { + device = service.paths.path0; + fsType = "none"; + options = [ + "bind" + ]; + depends = [ + ceres.storage0.mount + ]; }; - config = lib.mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + systemd.tmpfiles.rules = [ + "Z ${service.paths.path0} 755 ${service.name} ${service.name} -" + ]; - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.port ]; + networking = { + firewall = { + allowedTCPPorts = [ + service.ports.port0 + ]; }; - - systemd.services.comfyui = { - description = "ComfyUI Service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - serviceConfig = { - Type = "simple"; - ExecStart = "${cfg.package}/bin/comfyui --port ${toString cfg.port} --listen ${cfg.host}"; - Restart = "on-failure"; - User = "comfyui"; - Group = "comfyui"; - WorkingDirectory = "/var/lib/comfyui"; - }; - }; - - users.users.comfyui = { - group = "comfyui"; - isSystemUser = true; - home = "/var/lib/comfyui"; - createHome = true; - }; - - users.groups.comfyui = { }; }; } diff --git a/systems/ceres/config/comfyui.nix b/systems/ceres/config/comfyui.nix deleted file mode 100755 index 371bee3..0000000 --- a/systems/ceres/config/comfyui.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - config, - pkgs, - flake, - ... -}: -let - inherit (flake.config.machines.devices) - ceres - ; - inherit (flake.config.services.instances) - comfyui - web - ; - service = comfyui; - localhost = web.localhost.address1; -in -{ - nixpkgs.overlays = [ - flake.inputs.nix-comfyui.overlays.default - ]; - - services.comfyui = { - enable = true; - openFirewall = true; - host = localhost; - package = pkgs.comfyuiPackages.comfyui.override { - extensions = with pkgs.comfyuiPackages.extensions; [ - acly-inpaint - acly-tooling - cubiq-ipadapter-plus - fannovel16-controlnet-aux - ]; - commandLineArgs = [ - "--preview-method" - "auto" - ]; - }; - }; - # 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 ${service.name} ${service.name} -" - # ]; - - users.users.${service.name}.extraGroups = [ - "users" - ]; - - networking = { - firewall = { - allowedTCPPorts = [ - service.ports.port0 - ]; - }; - }; -}