diff --git a/hosts/desktop/services/default.nix b/hosts/desktop/services/default.nix index 27d4eb8..fadf543 100644 --- a/hosts/desktop/services/default.nix +++ b/hosts/desktop/services/default.nix @@ -4,6 +4,6 @@ ./system.nix ./network.nix ./apps.nix - # ./llm.nix + ./llm.nix ]; } diff --git a/hosts/desktop/services/llama.cpp.patch b/hosts/desktop/services/llama.cpp.patch new file mode 100644 index 0000000..d63f7cd --- /dev/null +++ b/hosts/desktop/services/llama.cpp.patch @@ -0,0 +1,14 @@ +diff --git a/src/llama-quant.cpp b/src/llama-quant.cpp +index 89b7fe8d4301..847e79f46552 100644 +--- a/src/llama-quant.cpp ++++ b/src/llama-quant.cpp +@@ -849,7 +849,7 @@ static void init_quantize_state_counters(quantize_state_impl & qs, std::vector $out/COMMIT @@ -23,6 +23,10 @@ let ''; }; + patches = (oldAttrs.patches or [ ]) ++ [ + ./llama.cpp.patch + ]; + npmDepsHash = "sha256-TU4Gv+dd48WDpswhfVtm79IVIOwoCXz1fZ/DI/z40Wg="; cmakeFlags = (oldAttrs.cmakeFlags or [ ]) ++ [ @@ -61,20 +65,53 @@ in ${llama-server} \ --port ''${PORT} \ -m /mnt/SnowData/services/llama-cpp/gemma-4-26B-A4B-it/gemma-4-26B-A4B-it-Q4_K_M.gguf \ + # -m /mnt/SnowData/services/llama-cpp/Qwen3.6-27B/Qwen3.6-27B-TQ3_1S.gguf \ # --mmproj /mnt/SnowData/services/llama-cpp/gemma-4-26B-A4B-it/gemma-4-26B-A4B-it-vision.gguf \ -dev Rocm0 \ - -c 6288 \ + -c 65536 \ + -ngl 999 \ + -np 1 \ + --n-cpu-moe 6 \ + --cache-type-k q8_0 \ + --cache-type-v turbo3 \ -fit off \ - --fit-target 2048 \ - -ngl 24 \ + # --fit-target 2048 \ --direct_io \ - # --flash-attn on \ + --flash-attn on \ --no-webui''; env = [ "HOME=/mnt/SnowData/services/llama-cpp" ]; aliases = [ - "gemma-4-26B-A4B-it" + "gemma4-26B-A4B-it" + "gemma4-big" + ]; + }; + "Qwen3.6:35b" = { + cmd = '' + ${llama-server} \ + --port ''${PORT} \ + -m /mnt/SnowData/services/llama-cpp/Qwen3.6-35B-A3B/Qwen3.6-35B-A3B-Q4_K_M.gguf \ + -dev Rocm0 \ + -c 65536 \ + -ngl 999 \ + -np 1 \ + --n-cpu-moe 16 \ + --cache-type-k q8_0 \ + --cache-type-v turbo3 \ + -fit off \ + --direct_io \ + --flash-attn on \ + --no-webui + # --spec-type draft-mtp \ + # --spec-draft-n-max 3 \ + # --reasoning-budget 512 + ''; + env = [ + "HOME=/mnt/SnowData/services/llama-cpp" + ]; + aliases = [ + "Qwen3.6-35B-A3B" "the-best" ]; }; diff --git a/hosts/desktop/system/configuration.nix b/hosts/desktop/system/configuration.nix index 3bb1e10..b5a3a23 100644 --- a/hosts/desktop/system/configuration.nix +++ b/hosts/desktop/system/configuration.nix @@ -101,8 +101,8 @@ "ntfs" "btrfs" ]; - # kernelPackages = pkgs.linuxPackages_cachyos-rc; - # kernelPackages = pkgs.linuxPackages_cachyos; + # kernelPackages = pkgs.linuxPackages_cachyos-rc; + kernelPackages = pkgs.linuxPackages_cachyos; # kernelPackages = pkgs.linuxPackages_lqx; # kernelPackages = pkgs.linuxPackages_zen; # kernelPackages = pkgs.linuxPackages; @@ -139,10 +139,11 @@ "net.core.default_qdisc" = "fq"; }; + # Disable speakers going into a powersaving state extraModprobeConfig = '' - options snd-hda-intel power_save=0 power_save_controller=N # Disable speakers going into a powersaving state - # options amdgpu ppfeaturemask=0xFFF7FFFF + options snd-hda-intel power_save=0 power_save_controller=N ''; + # options amdgpu ppfeaturemask=0xFFF7FFFF initrd.kernelModules = [ "kvm-amd" @@ -301,15 +302,17 @@ }; }; + documentation.man.cache.enable = false; + xdg = { portal = { enable = true; xdgOpenUsePortal = true; extraPortals = with pkgs; [ - xdg-desktop-portal-hyprland + # xdg-desktop-portal-hyprland xdg-desktop-portal-gtk ]; - configPackages = [ pkgs.hyprland ]; + # configPackages = [ pkgs.hyprland ]; }; }; diff --git a/modules/npins/sources.json b/modules/npins/sources.json index 531fa15..fbd90d2 100644 --- a/modules/npins/sources.json +++ b/modules/npins/sources.json @@ -21,9 +21,9 @@ }, "branch": "nyxpkgs-unstable", "submodules": false, - "revision": "913a42f0b735911f667e6350163e49a4ecf27c8f", - "url": "https://github.com/chaotic-cx/nyx/archive/913a42f0b735911f667e6350163e49a4ecf27c8f.tar.gz", - "hash": "sha256-JVotL2jGZ0CTUcF4yO0DuBj1huMrwAIHRgw0Ecn+aIg=" + "revision": "f75a3ace95019afead74c2d68de86a4da0686ccc", + "url": "https://github.com/chaotic-cx/nyx/archive/f75a3ace95019afead74c2d68de86a4da0686ccc.tar.gz", + "hash": "sha256-B770yiSd3FJ1d6dJv1qBhdfx5E0ZnFFIAWcRUCXRZSw=" }, "flake-compat": { "type": "Git", @@ -61,9 +61,9 @@ }, "branch": "main", "submodules": false, - "revision": "26089c056ea561e695f74945f12872f24eb08e67", - "url": "https://github.com/feel-co/hjem/archive/26089c056ea561e695f74945f12872f24eb08e67.tar.gz", - "hash": "sha256-wYo/odcGVHPpu78Y+EbINdfUDd30CWMpwC1UsN762Ck=" + "revision": "7dc2f4b1ee69c9ae3f223ab1fa4e95b93f72bc68", + "url": "https://github.com/feel-co/hjem/archive/7dc2f4b1ee69c9ae3f223ab1fa4e95b93f72bc68.tar.gz", + "hash": "sha256-QF9moiMJtq6OVOmzJhpjM78tlMAC5J+tvNWaOz4v9wY=" }, "hjem-rum": { "type": "Git", @@ -74,9 +74,9 @@ }, "branch": "main", "submodules": false, - "revision": "73f6d1c01fe94e3de1cb3a84b9346da52f483c60", - "url": "https://github.com/snugnug/hjem-rum/archive/73f6d1c01fe94e3de1cb3a84b9346da52f483c60.tar.gz", - "hash": "sha256-QIzbnJIwy5cMYvPmLYPA4ar0lhficYLKZ6ytcHK90Uo=" + "revision": "b32f85bdef43f274d6f6324a522bf958692c8faf", + "url": "https://github.com/snugnug/hjem-rum/archive/b32f85bdef43f274d6f6324a522bf958692c8faf.tar.gz", + "hash": "sha256-enpxBJqJQ4kw8FRpGGBwdeV2rnC+v7u1I1NrESS6Pow=" }, "home-manager": { "type": "Git", @@ -100,9 +100,9 @@ }, "branch": "nixos-26.05", "submodules": false, - "revision": "8623c4c20aa4ca2f5fb81510d2944066c3fb0d96", - "url": "https://github.com/NixOS/nixpkgs/archive/8623c4c20aa4ca2f5fb81510d2944066c3fb0d96.tar.gz", - "hash": "sha256-eKbrvPoAOFutbYMdbB3r5EQVmFxKv24iKqHPPUXA0gM=" + "revision": "2f5a153c270b70cb0f8c11f46d96d6d3bc39f4e3", + "url": "https://github.com/NixOS/nixpkgs/archive/2f5a153c270b70cb0f8c11f46d96d6d3bc39f4e3.tar.gz", + "hash": "sha256-Yjv0WEg39KRYS0rBdTbu6Fc/or/ihAKk13W9sQ6VWd0=" }, "nixpkgs-unstable": { "type": "Git", @@ -113,9 +113,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "624af665418d3c65d544145b4d34ad696439570e", - "url": "https://github.com/NixOS/nixpkgs/archive/624af665418d3c65d544145b4d34ad696439570e.tar.gz", - "hash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=" + "revision": "c8c029256f3d21e57f0901e97d181a2d336bfd62", + "url": "https://github.com/NixOS/nixpkgs/archive/c8c029256f3d21e57f0901e97d181a2d336bfd62.tar.gz", + "hash": "sha256-6TAllHYMfQkcFA7eH6o6/KzHIdT2UbTIZ0dyLY71VuY=" }, "sops-nix": { "type": "Git", @@ -138,9 +138,9 @@ }, "branch": "master", "submodules": false, - "revision": "bebc427408bdc836350e59d73c1879a0de6982b9", + "revision": "80deba14cfdf63762bfd9fb0594a9073f2c24183", "url": null, - "hash": "sha256-56tH4JlQU336f8hxQQnTrMTmiFh/hcpSIyG1Q8Z4YpU=" + "hash": "sha256-G67dF9w6I8kYERjMmnWxW96D8WiqQsdleTQN+RNzq7s=" }, "tauon-fix": { "type": "Git", @@ -177,9 +177,9 @@ }, "branch": "main", "submodules": false, - "revision": "163fb9c2cb58f402ea8da849e0412d583b7fdf3b", - "url": "https://github.com/0xc000022070/zen-browser-flake/archive/163fb9c2cb58f402ea8da849e0412d583b7fdf3b.tar.gz", - "hash": "sha256-0RSrog5pYzJur43VoT+Ur6R7csV8ltQI4tFbc9PjR98=" + "revision": "5f1a4be4d280e1ae06d61a75775a234b1714da3f", + "url": "https://github.com/0xc000022070/zen-browser-flake/archive/5f1a4be4d280e1ae06d61a75775a234b1714da3f.tar.gz", + "hash": "sha256-8DNJUVM10ktK02V9ZIV064CH+fuPF272VCAZBn6arig=" } }, "version": 8 diff --git a/modules/shared/system/minimizing.nix b/modules/shared/system/minimizing.nix index 140990e..461275b 100644 --- a/modules/shared/system/minimizing.nix +++ b/modules/shared/system/minimizing.nix @@ -38,6 +38,7 @@ # nixos.enable = false; man.enable = true; + man.cache.enable = false; }; environment = {