diff --git a/flake.nix b/flake.nix index 9128679e..d696eab3 100644 --- a/flake.nix +++ b/flake.nix @@ -118,6 +118,10 @@ # musnix.url = "github:musnix/musnix"; # musnix.inputs.nixpkgs.follows = "nixpkgs"; + # ComfyUI + # nixified-ai.url = "github:nixified-ai/flake"; + # comfyui-nix.url = "github:utensils/comfyui-nix"; + masssprings.url = "git+https://gitea.local.chriphost.de/christoph/cpp-masssprings"; masssprings.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -169,6 +173,7 @@ 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;}) @@ -236,6 +241,8 @@ extraModules = [ inputs.disko.nixosModules.disko + # inputs.nixified-ai.nixosModules.comfyui + # inputs.comfyui-nix.nixosModules.default ] ++ commonModules; }; diff --git a/home/christoph/nixinator/default.nix b/home/christoph/nixinator/default.nix index e868bc16..9f584fb4 100644 --- a/home/christoph/nixinator/default.nix +++ b/home/christoph/nixinator/default.nix @@ -123,6 +123,9 @@ vscode # ghidra # launch with _JAVA_AWT_WM_NONREPARENTING=1 (use programs.ghidra) + # AI stuff + # comfy-ui-cuda # Use module + # Unity Stuff # unityhub # rider-unity @@ -182,35 +185,6 @@ }; services = { - ollama = { - enable = false; - acceleration = "cuda"; - # home = "/var/lib/ollama"; - - # loadModels = [ - # "deepseek-r1:8b" # Default - # "deepseek-r1:14b" - # ]; - - # https://github.com/ollama/ollama/blob/main/docs/faq.md#how-do-i-configure-ollama-server - environmentVariables = { - # Flash Attention is a feature of most modern models - # that can significantly reduce memory usage as the context size grows. - OLLAMA_FLASH_ATTENTION = "1"; - - # The K/V context cache can be quantized to significantly - # reduce memory usage when Flash Attention is enabled. - OLLAMA_KV_CACHE_TYPE = "q8_0"; # f16, q8_0 q4_0 - - # To improve Retrieval-Augmented Generation (RAG) performance, you should increase - # the context length to 8192+ tokens in your Ollama model settings. - OLLAMA_CONTEXT_LENGTH = "8192"; - }; - - host = "127.0.0.1"; - port = 11434; - }; - flatpak = { packages = [ # "com.valvesoftware.Steam" diff --git a/system/cachix/nix-community.nix b/system/cachix/nix-community.nix index d35a2a60..3376c373 100644 --- a/system/cachix/nix-community.nix +++ b/system/cachix/nix-community.nix @@ -3,10 +3,12 @@ substituters = [ "https://nix-community.cachix.org" # "https://app.cachix.org/cache/nixos-rocm" + # "https://ai.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # "nixos-rocm.cachix.org-1:VEpsf7pRIijjd8csKjFNBGzkBqOmw8H9PRmgAq14LnE=" + # "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" ]; }; } diff --git a/system/systemmodules/impermanence/default.nix b/system/systemmodules/impermanence/default.nix index 4135497b..88449841 100644 --- a/system/systemmodules/impermanence/default.nix +++ b/system/systemmodules/impermanence/default.nix @@ -117,6 +117,7 @@ in { # The shit some applications add to ~/ without asking # (mkUDir ".android" m755) # Unity + # (mkUDir ".comfy" m755) (mkUDir ".docker" m755) # (mkUDir ".gradle" m755) # Unity (mkUDir ".java" m755) # JetBrains @@ -125,7 +126,7 @@ in { (mkUDir ".mozilla/native-messaging-hosts" m755) (mkUDir ".nix-package-search" m755) # (mkUDir ".nv" m755) # Unity - (mkUDir ".ollama" m755) + # (mkUDir ".ollama" m755) # (mkUDir ".plastic4" m755) # Unity (mkUDir ".tiddl" m755) (mkUDir ".var/app" m755)