From f5f23388ce869b964bf1f5d0c025a6631f7772fa Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Tue, 12 May 2026 12:58:14 +0200 Subject: [PATCH] System/Nixinator: Update comfy config --- flake.lock | 115 +++++++---------------------------- flake.nix | 6 -- lib/nixos.nix | 4 +- system/nixinator/default.nix | 25 +------- system/services/comfyui.nix | 14 ++--- 5 files changed, 33 insertions(+), 131 deletions(-) diff --git a/flake.lock b/flake.lock index a475c55d..e02a71d1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,5 @@ { "nodes": { - "comfyui-nix": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1776979072, - "narHash": "sha256-1BUQDAMWGVcUhPuI5JFQmCTYlBmN/Fmon6MGmaKXrCk=", - "owner": "utensils", - "repo": "comfyui-nix", - "rev": "8a90889efc8fae81a8e03b8d9a8406c9f8ff425b", - "type": "github" - }, - "original": { - "owner": "utensils", - "repo": "comfyui-nix", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1754269165, @@ -36,7 +17,7 @@ }, "devshell": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1768818222, @@ -75,7 +56,7 @@ }, "elephant": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems" }, "locked": { @@ -161,24 +142,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -199,7 +162,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -220,7 +183,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nur", @@ -357,7 +320,7 @@ }, "hytale-launcher": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1777394001, @@ -376,7 +339,7 @@ "impermanence": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1769548169, @@ -396,7 +359,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], @@ -442,7 +405,7 @@ "naersk": { "inputs": { "fenix": "fenix", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1763384566, @@ -520,7 +483,7 @@ "inputs": { "flake-compat": "flake-compat_2", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1776242217, @@ -596,35 +559,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1762156382, + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1777428379, @@ -658,22 +606,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1762156382, - "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1764242076, "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", @@ -689,7 +621,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1777268161, "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", @@ -705,7 +637,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -721,7 +653,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1775710090, "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", @@ -737,7 +669,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1777268161, "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", @@ -753,7 +685,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -769,7 +701,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1775710090, "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", @@ -787,7 +719,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], @@ -832,7 +764,7 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixpkgs" ] @@ -879,7 +811,6 @@ }, "root": { "inputs": { - "comfyui-nix": "comfyui-nix", "devshell": "devshell", "disko": "disko", "elephant": "elephant", @@ -893,7 +824,7 @@ "nix-alien": "nix-alien", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", "nixvim": "nixvim", "nps": "nps", @@ -1061,7 +992,7 @@ "elephant": [ "elephant" ], - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "systems": "systems_5" }, "locked": { diff --git a/flake.nix b/flake.nix index bb48fb48..6575f3f4 100644 --- a/flake.nix +++ b/flake.nix @@ -86,9 +86,6 @@ # musnix.url = "github:musnix/musnix"; # musnix.inputs.nixpkgs.follows = "nixpkgs"; - # ComfyUI - comfyui-nix.url = "github:utensils/comfyui-nix"; - # HyTale hytale-launcher.url = "github:JPyke3/hytale-launcher-nix"; @@ -145,7 +142,6 @@ inputs.nur.overlays.default inputs.niri.overlays.niri # inputs.emacs-overlay.overlay - inputs.comfyui-nix.overlays.default # All my own overlays (derivations + modifications) (import ./overlays {inherit inputs nixpkgs pkgs-stable;}) @@ -256,8 +252,6 @@ extraModules = [ inputs.disko.nixosModules.disko - # inputs.nixified-ai.nixosModules.comfyui - inputs.comfyui-nix.nixosModules.default ] ++ commonModules; }; diff --git a/lib/nixos.nix b/lib/nixos.nix index 5d515d6c..7344273b 100644 --- a/lib/nixos.nix +++ b/lib/nixos.nix @@ -23,14 +23,14 @@ substituters = [ "https://cache.nixos.org" "https://nix-community.cachix.org" - "https://comfyui.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=" + # "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 f7aedfcb..7ba00f20 100644 --- a/system/nixinator/default.nix +++ b/system/nixinator/default.nix @@ -12,7 +12,7 @@ ./disks.nix # General services - # ../services/comfyui.nix + ../services/comfyui.nix ../services/fileflows-node.nix ]; @@ -124,7 +124,6 @@ # 31431 # Parsec 5173 # SvelteKit 8090 # PocketBase - 8188 # ComfyUI ]; allowedUDPPorts = [ @@ -135,7 +134,6 @@ # 31431 # Parsec 5173 # SvelteKit 8090 # PocketBase - 8188 # ComfyUI ]; }; @@ -234,27 +232,6 @@ fileSystems = ["/"]; }; - # Temporarily ban IPs for SSH after failed login attempts - fail2ban = { - enable = true; - }; - - greetd = { - enable = false; - restart = false; - useTextGreeter = true; - - settings = { - terminal.vt = 1; - - default_session = { - # command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd $SHELL"; - command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd niri-session"; - user = "greeter"; - }; - }; - }; - kmscon = { enable = false; hwRender = true; diff --git a/system/services/comfyui.nix b/system/services/comfyui.nix index ba79491e..4593417e 100644 --- a/system/services/comfyui.nix +++ b/system/services/comfyui.nix @@ -7,8 +7,8 @@ }: let # comfyuiVersion = "cu128-slim-20260316"; # comfyuiVersion = "cu128-megapak-20260413"; - # comfyuiVersion = "cu130-megapak-pt211-20260330"; - comfyuiVersion = "cu130-megapak-pt211-20260413"; + # comfyuiVersion = "cu130-megapak-pt211-20260413"; + comfyuiVersion = "cu130-megapak-pt211-20260508"; in { virtualisation.oci-containers.containers = { comfyui = { @@ -58,11 +58,11 @@ in { # 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-xformers" - "--use-sage-attention" # Crashes + # "--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 ]; };