From 6fe8860dbc86fd5423cf92ab35554b60541e4374 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 12:59:00 -0500 Subject: [PATCH 01/11] feat: quick push --- .../floorp/config/bookmarks/config/development.nix | 11 +++++++++++ .../config/userSettings/config/interface/default.nix | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/development.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/development.nix index f8a5c35..08f056f 100755 --- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/development.nix +++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/development.nix @@ -39,6 +39,17 @@ in ]; keyword = "Elm"; } + { + name = "Awesome Self-Hosted"; + url = "https://github.com/awesome-selfhosted/awesome-selfhosted"; + tags = [ + "awesome" + "self-hosted" + "self" + "hosted" + ]; + keyword = "Self"; + } { name = "GitHub"; url = "https://github.com/BRBWaffles"; diff --git a/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix b/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix index f27c49c..512f1f8 100755 --- a/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix +++ b/modules/home/gui/apps/code/zed/config/userSettings/config/interface/default.nix @@ -17,7 +17,7 @@ in theme = "Catppuccin Macchiato"; show_copilot_suggestions = true; bracket_pairing = "always"; - relative_line_numbers = true; + relative_line_numbers = false; tabs = { file_icons = true; git_status = true; From ec9d3ac349344670fea518c805e98aca3ee24007 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 13:35:00 -0500 Subject: [PATCH 02/11] feat: added nvidia to server --- systems/ceres/config/graphics.nix | 67 ++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/systems/ceres/config/graphics.nix b/systems/ceres/config/graphics.nix index b67a5df..091c3a5 100755 --- a/systems/ceres/config/graphics.nix +++ b/systems/ceres/config/graphics.nix @@ -1,24 +1,61 @@ -{ pkgs, ... }: { + pkgs, + config, + lib, + ... +}: +{ + environment = { + etc."libva.conf".text = '' + LIBVA_MESSAGING_LEVEL=1 + ''; + systemPackages = builtins.attrValues { + inherit (pkgs) ddcutil; + # inherit (pkgs.cudaPackages) cudatoolkit cudnn; # cutensor; # tensorrt; + # inherit (pkgs.nvtopPackages) full; + }; + sessionVariables = { + MOZ_DISABLE_RDD_SANDBOX = 1; + LIBVA_DRIVER_NAME = "nvidia"; + }; + variables = { + GBM_BACKEND = "nvidia-drm"; + __GLX_VENDOR_LIBRARY_NAME = "nvidia"; + NIZOS_OZONE_WL = "1"; + KWIN_DRM_ALLOW_NVIDIA_COLORSPACE = "1"; + ENABLE_HDR_WSI = "1"; + }; + }; + hardware = { graphics = { enable = true; - extraPackages = builtins.attrValues { - inherit (pkgs) - amdvlk - ; - inherit (pkgs.rocmPackages.clr) - icd - ; - }; + enable32Bit = true; + extraPackages = builtins.attrValues { inherit (pkgs) nvidia-vaapi-driver vaapiVdpau; }; extraPackages32 = builtins.attrValues { - inherit (pkgs.driversi686Linux) - amdvlk - ; + inherit (pkgs.pkgsi686Linux) nvidia-vaapi-driver vaapiVdpau; + }; + }; + nvidia = { + modesetting.enable = true; + forceFullCompositionPipeline = false; + nvidiaSettings = true; + open = true; + gsp.enable = true; + package = config.boot.kernelPackages.nvidiaPackages.beta; + powerManagement = { + enable = true; + finegrained = false; }; }; }; - boot.initrd.kernelModules = [ - "amdgpu" - ]; + + services = { + xserver = { + enable = true; + videoDrivers = [ "nvidia" ]; + }; + }; + + hardware.nvidia-container-toolkit.enable = lib.mkIf config.virtualisation.docker.enable true; } From b32cbc0b7237787322258c4bc1aea9b74f2a0b0d Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 14:06:51 -0500 Subject: [PATCH 03/11] feat: added nvidia to server --- modules/nixos/services/ollama/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix index 78108cd..3c96135 100755 --- a/modules/nixos/services/ollama/default.nix +++ b/modules/nixos/services/ollama/default.nix @@ -71,7 +71,7 @@ in else { port = service.ports.port1; - acceleration = false; + acceleration = "cuda"; models = service.paths.path0; } ); From 84e945f7e6f522a525a483fc716f6eb5260fe07f Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 14:57:37 -0500 Subject: [PATCH 04/11] feat: added comfy ui --- flake.lock | 162 +++++++++++++++++++-- flake.nix | 2 + modules/nixos/default.nix | 1 + modules/nixos/services/comfyui/default.nix | 23 +++ 4 files changed, 178 insertions(+), 10 deletions(-) create mode 100644 modules/nixos/services/comfyui/default.nix diff --git a/flake.lock b/flake.lock index 29e225c..c111c28 100755 --- a/flake.lock +++ b/flake.lock @@ -356,7 +356,24 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, + "flake-utils_5": { + "inputs": { + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -1062,10 +1079,52 @@ "type": "github" } }, + "nix-comfyui": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3", + "poetry2nix": "poetry2nix" + }, + "locked": { + "lastModified": 1733961600, + "narHash": "sha256-kEM0Dck4K4dg9QYmdldy62av+XzsNz9XhfTAhtGWwzo=", + "owner": "dyscorv", + "repo": "nix-comfyui", + "rev": "cbd17e10b53dcf8fd9f5ba6f3c1ea1a550082659", + "type": "github" + }, + "original": { + "owner": "dyscorv", + "repo": "nix-comfyui", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nix-comfyui", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, @@ -1145,6 +1204,20 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1733749988, + "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1749143949, "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", @@ -1160,7 +1233,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1749285348, "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", @@ -1176,7 +1249,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1747312588, "narHash": "sha256-MmJvj6mlWzeRwKGLcwmZpKaOPZ5nJb/6al5CXqJsgjo=", @@ -1198,7 +1271,7 @@ "nixpkgs": [ "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix_3" }, "locked": { "lastModified": 1749427072, @@ -1214,6 +1287,37 @@ "type": "github" } }, + "poetry2nix": { + "inputs": { + "flake-utils": [ + "nix-comfyui", + "flake-utils" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nix-comfyui", + "nixpkgs" + ], + "systems": [ + "nix-comfyui", + "flake-utils", + "systems" + ], + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1731205797, + "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e", + "type": "github" + }, + "original": { + "id": "poetry2nix", + "type": "indirect" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1334,12 +1438,13 @@ "lix-module": "lix-module", "ngipkgs": "ngipkgs", "niri": "niri", + "nix-comfyui": "nix-comfyui", "nixos-cosmic": "nixos-cosmic", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", - "systems": "systems_6", + "systems": "systems_7", "waybar": "waybar", "yazi": "yazi", "zed-editor": "zed-editor", @@ -1570,6 +1675,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1680978846, "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", @@ -1584,7 +1704,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1622,6 +1742,28 @@ } }, "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nix-comfyui", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730120726, + "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_3": { "inputs": { "nixpkgs": [ "nur", @@ -1739,8 +1881,8 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_5", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay_3" }, "locked": { diff --git a/flake.nix b/flake.nix index 745401e..aace8d3 100755 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,7 @@ url = "gitlab:InvraNet/zen-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-comfyui.url = "github:dyscorv/nix-comfyui"; }; outputs = inputs: @@ -125,6 +126,7 @@ config.nixosModules.mantle inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default + inputs.nix-comfyui.nixosModules.default # inputs.ngipkgs.nixosModules."services.peertube" # inputs.ngipkgs.nixosModules.default inputs.sops-nix.nixosModules.sops diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 8228d2f..02b829c 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -64,6 +64,7 @@ in searx vaultwarden website + comfyui ; }; }; diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix new file mode 100644 index 0000000..e312c1f --- /dev/null +++ b/modules/nixos/services/comfyui/default.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: + +let + my-comfyui = pkgs.comfyuiPackages.comfyui.override { + extensions = [ + pkgs.comfyuiPackages.extensions.acly-inpaint + pkgs.comfyuiPackages.extensions.acly-tooling + pkgs.comfyuiPackages.extensions.cubiq-ipadapter-plus + pkgs.comfyuiPackages.extensions.fannovel16-controlnet-aux + ]; + + commandLineArgs = [ + "--preview-method" + "auto" + ]; + }; +in + +{ + environment.systemPackages = [ + my-comfyui + ]; +} From f70f5814fb35a8fe36b4ce82ba58b7b3957cd243 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 15:49:52 -0500 Subject: [PATCH 05/11] feat: added comfy ui --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index aace8d3..3dc0d8e 100755 --- a/flake.nix +++ b/flake.nix @@ -126,7 +126,6 @@ config.nixosModules.mantle inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default - inputs.nix-comfyui.nixosModules.default # inputs.ngipkgs.nixosModules."services.peertube" # inputs.ngipkgs.nixosModules.default inputs.sops-nix.nixosModules.sops From 3760b9d08234fdb71cfe8a08b6adfdecfced5d40 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 16:11:14 -0500 Subject: [PATCH 06/11] feat: added comfy ui --- modules/nixos/services/comfyui/default.nix | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix index e312c1f..5b7f327 100644 --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -1,23 +1,6 @@ { pkgs, ... }: - -let - my-comfyui = pkgs.comfyuiPackages.comfyui.override { - extensions = [ - pkgs.comfyuiPackages.extensions.acly-inpaint - pkgs.comfyuiPackages.extensions.acly-tooling - pkgs.comfyuiPackages.extensions.cubiq-ipadapter-plus - pkgs.comfyuiPackages.extensions.fannovel16-controlnet-aux - ]; - - commandLineArgs = [ - "--preview-method" - "auto" - ]; - }; -in - { environment.systemPackages = [ - my-comfyui + pkgs.comfyuiPackages ]; } From 3df728d52886b2c4a8242feb1eb9aa7c5299f616 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 16:23:38 -0500 Subject: [PATCH 07/11] feat: added comfy ui --- modules/nixos/services/comfyui/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix index 5b7f327..92e7609 100644 --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -1,6 +1,9 @@ -{ pkgs, ... }: { - environment.systemPackages = [ - pkgs.comfyuiPackages + pkgs, + ... +}: +{ + environment.comfyuiPackages = [ + pkgs.comfyui ]; } From 75b55493fe721e07a6114f5bf3c8dc45480b8afa Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 16:25:10 -0500 Subject: [PATCH 08/11] feat: added comfy ui --- modules/nixos/services/comfyui/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix index 92e7609..2ca2d4d 100644 --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -1,7 +1,15 @@ { - pkgs, + flake, ... }: +let + pkgs = import flake.inputs.nixpkgs { + system = "x86_64-linux"; + overlays = [ + flake.inputs.nix-comfyui.overlays.default + ]; + }; +in { environment.comfyuiPackages = [ pkgs.comfyui From 053429b0b8389a51d6c3ef2af437d50a453420bf Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 16:56:51 -0500 Subject: [PATCH 09/11] feat: added comfy ui --- modules/nixos/services/comfyui/default.nix | 85 +++++++++++++++++++--- 1 file changed, 75 insertions(+), 10 deletions(-) diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix index 2ca2d4d..cc8e7ca 100644 --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -1,17 +1,82 @@ { - flake, + config, + lib, + pkgs, ... }: + let - pkgs = import flake.inputs.nixpkgs { - system = "x86_64-linux"; - overlays = [ - flake.inputs.nix-comfyui.overlays.default - ]; - }; + cfg = config.services.comfyui; in { - environment.comfyuiPackages = [ - pkgs.comfyui - ]; + options.services.comfyui = with lib; { + enable = mkEnableOption "ComfyUI service"; + + package = mkOption { + type = types.package; + default = pkgs.comfyuiPackages.comfyui.override { + extensions = with pkgs.comfyuiPackages.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 = { }; + }; } From cd535a7d48abe4fafcbeaf88e1b8c0639c7492ed Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 17:10:41 -0500 Subject: [PATCH 10/11] feat: added comfy ui --- modules/nixos/services/comfyui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix index cc8e7ca..a9df14c 100644 --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -37,7 +37,7 @@ in host = mkOption { type = types.str; - default = "127.0.0.1"; + default = "0.0.0.0"; description = "Host to bind to"; }; From 9598576855ab793944b9f9a24d94ab921e6d0a96 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Jul 2025 17:16:20 -0500 Subject: [PATCH 11/11] feat: added comfy ui --- modules/nixos/services/comfyui/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/nixos/services/comfyui/default.nix b/modules/nixos/services/comfyui/default.nix index a9df14c..802eb49 100644 --- a/modules/nixos/services/comfyui/default.nix +++ b/modules/nixos/services/comfyui/default.nix @@ -79,4 +79,19 @@ in users.groups.comfyui = { }; }; + services.comfyui = { + enable = true; + package = pkgs.comfyuiPackages.comfyui.override { + extensions = with pkgs.comfyuiPackages.extensions; [ + acly-inpaint + acly-tooling + cubiq-ipadapter-plus + fannovel16-controlnet-aux + ]; + commandLineArgs = [ + "--preview-method" + "auto" + ]; + }; + }; }