diff --git a/lib/nixos.nix b/lib/nixos.nix index 7344273b..125f15c6 100644 --- a/lib/nixos.nix +++ b/lib/nixos.nix @@ -23,15 +23,11 @@ substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" - # "https://comfyui.cachix.org" - # "https://ai.cachix.org" # "https://app.cachix.org/cache/nixos-rocm" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "comfyui.cachix.org-1:33mf9VzoIjzVbp0zwj+fT51HG0y31ZTK3nzYZAX0rec=" - # "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" # "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE=" ]; }; diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix index 586552d0..0859eee8 100644 --- a/system/nixinator/default.nix +++ b/system/nixinator/default.nix @@ -12,7 +12,6 @@ ./disks.nix # General services - ../services/comfyui.nix ../services/fileflows-node.nix ]; diff --git a/system/servenix/default.nix b/system/servenix/default.nix index 8c8f1dc6..52938017 100644 --- a/system/servenix/default.nix +++ b/system/servenix/default.nix @@ -24,7 +24,6 @@ # General services ../services/authelia.nix ../services/bazarr.nix - ../services/box.nix ../services/fileflows.nix ../services/gitea.nix ../services/immich.nix diff --git a/system/services/box.nix b/system/services/box.nix deleted file mode 100644 index 35e0b656..00000000 --- a/system/services/box.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - mylib, - config, - lib, - pkgs, - ... -}: let - boxVersion = "v0.31.0"; -in { - virtualisation.oci-containers.containers = { - box = { - image = "stashapp/stash:${boxVersion}"; - autoStart = true; - - login = mylib.containers.mkDockerLogin config; - - dependsOn = []; - - ports = [ - # "9999:9999" - ]; - - volumes = [ - "/etc/localtime:/etc/localtime:ro" - - "/media/Box:/data" - - "box_config:/root/.stash" - "box_metadata:/metadata" - "box_cache:/cache" - "box_blobs:/blobs" - "box_generated:/generated" - ]; - - environment = { - PUID = "3000"; - PGID = "3000"; - TZ = "Europe/Berlin"; - - STASH_STASH = "/data/"; - STASH_GENERATED = "/generated/"; - STASH_METADATA = "/metadata/"; - STASH_CACHE = "/cache/"; - }; - - extraOptions = [ - "--privileged" - "--device=nvidia.com/gpu=all" - "--net=behind-nginx" - ]; - }; - }; -} diff --git a/system/services/comfyui.nix b/system/services/comfyui.nix deleted file mode 100644 index b66971d1..00000000 --- a/system/services/comfyui.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - mylib, - config, - lib, - pkgs, - ... -}: let - # comfyuiVersion = "cu128-slim-20260316"; - # comfyuiVersion = "cu128-megapak-20260413"; - # comfyuiVersion = "cu130-megapak-pt211-20260413"; - # comfyuiVersion = "cu130-megapak-pt211-20260508"; - comfyuiVersion = "cu130-megapak-pt211-20260604"; -in { - virtualisation.oci-containers.containers = { - comfyui = { - image = "yanwk/comfyui-boot:${comfyuiVersion}"; - autoStart = false; - - login = mylib.containers.mkDockerLogin config; - - dependsOn = []; - - ports = [ - "8188:8188" - ]; - - volumes = let - rootDir = "/home/christoph/Games/ComfyUI"; - in [ - # cu128-slim / cu128-megapak - # "${rootDir}/storage:/root" - # "${rootDir}/storage-models/models:/root/ComfyUI/models" - # "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub" - # "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub" - # "${rootDir}/storage-user/input:/root/ComfyUI/input" - # "${rootDir}/storage-user/output:/root/ComfyUI/output" - # "${rootDir}/storage-user/workflows:/root/ComfyUI/user/default/workflows" - - # cu130-megapak - "${rootDir}/storage-cache/dot-cache:/root/.cache" - "${rootDir}/storage-cache/dot-config:/root/.config" - "${rootDir}/storage-nodes/dot-local:/root/.local" - "${rootDir}/storage-nodes/comfy-extras:/root/ComfyUI/comfy_extras" - "${rootDir}/storage-nodes/custom_nodes:/root/ComfyUI/custom_nodes" - "${rootDir}/storage-models/models:/root/ComfyUI/models" - "${rootDir}/storage-models/hf-hub:/root/.cache/huggingface/hub" - "${rootDir}/storage-models/torch-hub:/root/.cache/torch/hub" - "${rootDir}/storage-user/input:/root/ComfyUI/input" - "${rootDir}/storage-user/output:/root/ComfyUI/output" - "${rootDir}/storage-user/user-profile:/root/ComfyUI/user" - "${rootDir}/storage-user/user-scripts:/root/user-scripts" - ]; - - environment = { - PUID = "1000"; - PGID = "1000"; - TZ = "Europe/Berlin"; - - # https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py - CLI_ARGS = lib.concatStringsSep " " [ - # "--cache-none" # Leads to single nodes being executed multiple times for each output connection :/ - # "--lowvram" - # "--disable-smart-memory" - # "--disable-pinned-memory" - # "--disable-dynamic-vram" - # "--disable-xformers" - # "--use-sage-attention" # Crashes - # "--reserve-vram 1" # (1 or 2) => Assume less vram is available to mitigate OOM due to wrong vram estimation - ]; - }; - - extraOptions = [ - "--privileged" - "--device=nvidia.com/gpu=all" - # "--net=behind-nginx" - ]; - }; - }; -} diff --git a/system/systemmodules/impermanence/default.nix b/system/systemmodules/impermanence/default.nix index 51f7ef21..4f60d110 100644 --- a/system/systemmodules/impermanence/default.nix +++ b/system/systemmodules/impermanence/default.nix @@ -70,7 +70,6 @@ in { (mkRDir "/usr/systemd-placeholder" m755) # TODO: Why does this use the mandb user? - # TODO: Why does this apparently conflict with comfyui-nix? # (mkDir "mandb" "/var/cache/man" m755) # (mkRDir "/var/cache/restic-backups-synology" m755)