diff --git a/modules/hosts/desktop/configuration.nix b/modules/hosts/desktop/configuration.nix index e7f706e..4270058 100644 --- a/modules/hosts/desktop/configuration.nix +++ b/modules/hosts/desktop/configuration.nix @@ -12,7 +12,10 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{ services.xserver.enable = true; services.displayManager.gdm.enable = true; services.desktopManager.gnome.enable = true; + services.desktopManager.plasma6.enable = true; + programs.ssh.askPassword = "${pkgs.x11_ssh_askpass}/libexec/z11-ssh-askpass"; + # Enable CUPS to print documents. services.printing.enable = true; @@ -49,6 +52,7 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{ home-manager sdrpp self.packages.${pkgs.stdenv.hostPlatform.system}.nh + nvtopPackages.full ]; # Some programs need SUID wrappers, can be configured further or are diff --git a/modules/hosts/laptop/configuration.nix b/modules/hosts/laptop/configuration.nix index 886c3cb..7d7497d 100644 --- a/modules/hosts/laptop/configuration.nix +++ b/modules/hosts/laptop/configuration.nix @@ -15,7 +15,6 @@ services.desktopManager.cosmic.enable = true; services.desktopManager.gnome.enable = true; services.desktopManager.plasma6.enable = true; - programs.ssh.askPassword = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; # Enable CUPS to print documents. diff --git a/modules/nixosModules/ai/llama.nix b/modules/nixosModules/ai/llama.nix index be1bf96..a5565d4 100644 --- a/modules/nixosModules/ai/llama.nix +++ b/modules/nixosModules/ai/llama.nix @@ -1,7 +1,8 @@ {self, inputs, ...}:{ flake.nixosModules.llama = { lib, pkgs, ... }: let llama_cmd = "${pkgs.llama-cpp-cuda}/bin/llama-server --port \${PORT} --mmap"; - sd_cmd = "${pkgs.stable-diffusion-cpp-cuda}/bin/sd-server --listen-port \${PORT}"; + sd_cmd = "${pkgs.stable-diffusion-cpp-cuda}/bin/sd-server --listen-port \${PORT} --offload-to-cpu --mmap --lora-model-dir ${sd_models}/LORA"; + tts_cmd = "${pkgs.pocket-tts}/bin/pocket-tts serve --port \${PORT}"; chat_models = "/var/AI/Models/Chat/ggufs"; sd_models = "/var/AI/Models/Art"; in { @@ -26,79 +27,161 @@ in { openFirewall = true; listenAddress = "0.0.0.0"; settings = { + healthCheckTimeout = 600; models = { + #TTS + "pocket_tts" = { + ttl = 3600; + cmd = "${tts_cmd}"; + }; + #Language Models - "angelic_eclipse-12b" = { + "llm/angelic_eclipse-12b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Angelic_Eclipse_12B-Q4_K_M.gguf"; }; - "cydonia-24b" = { + "llm/crimson-constellation-12b" = { + ttl = 3600; + cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Angelic_Eclipse_12B-Q4_K_M.gguf"; + }; + "llm/cydonia-24b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/TheDrummer_Cydonia-24B-v4.3-Q4_K_M.gguf"; }; - "cydonia-redux-22b" = { + "llm/cydonia-redux-22b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 32768 --model ${chat_models}/Cydonia-Redux-22B-v1.1-Q4_K_M.gguf"; }; - "gemma3-R1-27b" = { + "llm/gemma3-R1-27b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Gemma3-R1-27B-v1-Q4_K_M.gguf"; }; - "hearthfire-24b" = { + "llm/hearthfire-24b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Hearthfire-24B-Q4_K_M.gguf"; }; - "impish_bloodmoon" = { + "llm/impish_bloodmoon" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Impish_Bloodmoon-Q4_K_M.gguf"; }; - "llama_abliterated_dark_champion" = { + "llm/llama_abliterated_dark_champion" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Llama-3.2-8X3B-18.4B-MOE-Dark-Champion-Instruct-uncensored-abliterated-Q4_K_M.gguf"; }; - "loki-24b" = { + "llm/loki-24b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/M3.2-24B-Loki-V2-Q4_K_M.gguf"; }; - "magidonia-24b" = { + "llm/magidonia-24b" = { ttl = 3600; cmd = "${llama_cmd} -m ${chat_models}/Magidonia-24B-v4.3-Q4_K_M.gguf --ctx-size 131072"; }; - "mars-27b" = { + "llm/melody-12b-q8" = { + ttl = 3600; + cmd = "${llama_cmd} --ctx-size 262144 --model ${chat_models}/Melody1437-12B-v0.5-HB16-Q8_0.gguf"; + }; + "llm/melody-12b-q4" = { + ttl = 3600; + cmd = "${llama_cmd} --ctx-size 262144 --model ${chat_models}/Melody1437-12B-v0.5.i1-Q4_K_M_hb16.gguf"; + }; + "llm/melody-31b" = { + ttl = 3600; + cmd = "${llama_cmd} --ctx-size 262144 --model ${chat_models}/Melody1437-31B-v2.0-Q4_K_M.gguf"; + }; + "llm/mars-27b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Mars_27B_V1-28B-Q4_K_M.gguf"; }; - "omega_directive-24b" = { + "llm/omega_directive-24b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/MS3.2-The-Omega-Directive-24B-Unslop-v2.0-Q4_K_M.gguf"; }; - "qwen_14b" = { + "llm/orion-26b" = { + ttl = 3600; + cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Orion-26B-A4B-v1b-Q4_K_M.gguf"; + }; + "llm/qwen_14b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 40960 --model ${chat_models}/Qwen3-14B-Q4_K_M.gguf"; }; - "qwen_32b" = { + "llm/qwen_32b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 40960 --model ${chat_models}/Qwen3-32B-Q4_K_M.gguf"; }; - "snowpiercer-15b" = { + "llm/snowpiercer-15b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 65536 --model ${chat_models}/Snowpiercer-15B-v1-Q4_K_M.gguf"; }; - "valkyrie-49b" = { + "llm/valkyrie-49b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/Valkyrie-49B-v2.1-Q4_K_M.gguf"; }; - "wayfarer-12b" = { + "llm/wayfarer-12b" = { ttl = 3600; cmd = "${llama_cmd} --ctx-size 131072 --model ${chat_models}/wayfarer-12B-Q4_K_M.gguf"; }; #Diffusion Models - "cyberrealistic" = { + "sd/amanesseWorks" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/amanesseWorks_v20.safetensors"; + }; + "sd/animaOfficial" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --vae ${sd_models}/VAE_TEXT/qwen_image_vae.safetensors --llm ${sd_models}/VAE_TEXT/qwen_3_06b_base.safetensors --diffusion-model ${sd_models}/animaOfficial_preview3Base.safetensors"; + }; + "sd/azureStarfire" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/azureStarfire_stellarStable.safetensors"; + }; + "sd/cyberrealistic_pony_semi" = { ttl = 3600; checkEndpoint = "/"; cmd = "${sd_cmd} --model ${sd_models}/cyberrealisticPony_semiRealV45.safetensors"; }; + "sd/cyberrealistic_pony_core_small" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/cyberrealisticPony_v180Coreshift.safetensors"; + }; + "sd/cyberrealistic_pony_core_large" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/cyberrealisticPony_v180Coreshift(1).safetensors"; + }; + "sd/miaomiao_harem" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/miaomiaoHarem_v20.safetensors"; + }; + "sd/nova_furry" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/novaFurryXL_ilV150.safetensors"; + }; + "sd/nova_pkmn" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/novaPKMNXL_v10.safetensors"; + }; + "sd/unholy_desire" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/unholyDesireMixSinister_v80.safetensors"; + }; + "sd/waiIllustrious" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/waiIllustriousSDXL_v170.safetensors"; + }; + "sd/yiff_in_hell" = { + ttl = 3600; + checkEndpoint = "/"; + cmd = "${sd_cmd} --model ${sd_models}/yiffInHell_yihxxxTENDEDV20.safetensors"; + }; }; }; }; diff --git a/modules/nixosModules/applications.nix b/modules/nixosModules/applications.nix index 772cf07..4c1799f 100644 --- a/modules/nixosModules/applications.nix +++ b/modules/nixosModules/applications.nix @@ -20,6 +20,7 @@ hunspellDicts.en_US texstudio texliveFull + ]; programs.steam = { enable = true;