diff --git a/flake.nix b/flake.nix index 3dc0d8e..629909c 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:matthewcroughan/nixified-ai"; }; 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 index 90cb702..b2a7006 100755 --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -1,90 +1,55 @@ { 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 = [ ]; + nixpkgs.overlays = [ + flake.inputs.nix-comfyui.overlays.default + ]; - 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; + models = builtins.attrValues pkgs.nixified-ai.models; + customNodes = with 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 ]; + users.users.${service.name}.extraGroups = [ + "users" + ]; + + 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 a9ad410..0000000 --- a/systems/ceres/config/comfyui.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - config, - pkgs, - flake, - ... -}: -let - inherit (flake.config.machines.devices) ceres; - inherit (flake.config.services.instances) comfyui web; - inherit (flake.config.people) user0; - 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} -" - ]; - - users.users.${service.name}.extraGroups = [ - "users" - ]; - - networking = { - firewall = { - allowedTCPPorts = [ - service.ports.port0 - ]; - }; - }; -}