diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix old mode 100755 new mode 100644 index 7fdc26d..1679abd --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -1,20 +1,88 @@ -{ config, pkgs, ... }: { - services.comfyui = { - enable = true; - openFirewall = true; - host = "0.0.0.0"; # Allow external connections - package = pkgs.comfyuiPackages.comfyui.override { - extensions = with pkgs.comfyuiPackages.extensions; [ - acly-inpaint - acly-tooling - cubiq-ipadapter-plus - fannovel16-controlnet-aux - ]; - commandLineArgs = [ - "--preview-method" - "auto" - ]; + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.comfyui; +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"; + }; }; }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + + 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/services/comfyui/default.nix b/services/comfyui/default.nix deleted file mode 100644 index 1679abd..0000000 --- a/services/comfyui/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.services.comfyui; -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"; - }; - }; - }; - - config = lib.mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; - - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.port ]; - }; - - 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 new file mode 100755 index 0000000..7fdc26d --- /dev/null +++ b/systems/ceres/config/comfyui.nix @@ -0,0 +1,20 @@ +{ config, pkgs, ... }: +{ + services.comfyui = { + enable = true; + openFirewall = true; + host = "0.0.0.0"; # Allow external connections + package = pkgs.comfyuiPackages.comfyui.override { + extensions = with pkgs.comfyuiPackages.extensions; [ + acly-inpaint + acly-tooling + cubiq-ipadapter-plus + fannovel16-controlnet-aux + ]; + commandLineArgs = [ + "--preview-method" + "auto" + ]; + }; + }; +}