Compare commits
2 Commits
57b8980ebe
...
6507cbc0e0
| Author | SHA1 | Date | |
|---|---|---|---|
|
6507cbc0e0
|
|||
|
7e3985bd34
|
@ -143,22 +143,17 @@ in {
|
||||
protonmail-bridge-gui
|
||||
|
||||
# GUI stuff
|
||||
nautilus # Just in case
|
||||
signal-desktop
|
||||
anki
|
||||
font-manager # Previews fonts, but doesn't set them
|
||||
nextcloud-client
|
||||
keepassxc
|
||||
thunderbird # TODO: Email module
|
||||
obsidian
|
||||
zotero
|
||||
zeal # docs browser
|
||||
# helvum # unmaintained
|
||||
crosspipe
|
||||
vlc
|
||||
audacity
|
||||
ferdium
|
||||
gparted
|
||||
# ferdium
|
||||
# feishin # electron :(
|
||||
playerctl # Media player control
|
||||
czkawka-full # file deduplicator
|
||||
@ -169,6 +164,18 @@ in {
|
||||
hunspell # I cna't type
|
||||
hunspellDicts.en_US
|
||||
hunspellDicts.de_DE
|
||||
|
||||
# GTK-Apps
|
||||
# gnome-calculator
|
||||
# gnome-calendar
|
||||
# helvum # unmaintained
|
||||
crosspipe
|
||||
nautilus # Just in case
|
||||
font-manager # Previews fonts, but doesn't set them
|
||||
gparted
|
||||
resources
|
||||
# celluloid
|
||||
cine
|
||||
])
|
||||
|
||||
# Darwin exclusive packages
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
./disks.nix
|
||||
|
||||
# General services
|
||||
../services/comfyui.nix
|
||||
# ../services/comfyui.nix
|
||||
../services/fileflows-node.nix
|
||||
];
|
||||
|
||||
|
||||
@ -6,7 +6,9 @@
|
||||
...
|
||||
}: let
|
||||
# comfyuiVersion = "cu128-slim-20260316";
|
||||
comfyuiVersion = "cu128-megapak-20260323";
|
||||
# comfyuiVersion = "cu128-megapak-20260413";
|
||||
# comfyuiVersion = "cu130-megapak-pt211-20260330";
|
||||
comfyuiVersion = "cu130-megapak-pt211-20260413";
|
||||
in {
|
||||
virtualisation.oci-containers.containers = {
|
||||
comfyui = {
|
||||
@ -24,13 +26,28 @@ in {
|
||||
volumes = let
|
||||
rootDir = "/home/christoph/Games/ComfyUI";
|
||||
in [
|
||||
"${rootDir}/storage:/root"
|
||||
# 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/workflows:/root/ComfyUI/user/default/workflows"
|
||||
"${rootDir}/storage-user/user-profile:/root/ComfyUI/user"
|
||||
"${rootDir}/storage-user/user-scripts:/root/user-scripts"
|
||||
];
|
||||
|
||||
environment = {
|
||||
@ -39,12 +56,15 @@ in {
|
||||
TZ = "Europe/Berlin";
|
||||
|
||||
# https://github.com/Comfy-Org/ComfyUI/blob/master/comfy/cli_args.py
|
||||
# --use-sage-attention # => OOM
|
||||
# --lowvram
|
||||
# --disable-pinned-memory
|
||||
# --cache-none
|
||||
# --reserve-vram 1 # (1 or 2) => Assume less vram is available to mitigate OOM due to wrong vram estimation
|
||||
# CLI_ARGS = "--lowvram --disable-pinned-memory --cache-none --reserve-vram 2";
|
||||
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-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 = [
|
||||
|
||||
Reference in New Issue
Block a user