From 2e09c668e557906280d20123bfdb053fa53ab23f Mon Sep 17 00:00:00 2001 From: TheCrazyInsanity Date: Sun, 19 Apr 2026 18:27:15 -0400 Subject: [PATCH 1/2] bullshiiit --- global/default.nix | 1 + machines/homepc/configuration.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/global/default.nix b/global/default.nix index 02fa6b4..3eb42da 100755 --- a/global/default.nix +++ b/global/default.nix @@ -232,6 +232,7 @@ jq nasctui trilium-desktop + haruna ]; services.usbmuxd = { diff --git a/machines/homepc/configuration.nix b/machines/homepc/configuration.nix index d00858a..9c002f7 100755 --- a/machines/homepc/configuration.nix +++ b/machines/homepc/configuration.nix @@ -90,6 +90,9 @@ # As long as this is here the models are declarative. llama-server will grab them if not downloaded already. environment.etc."llama-swap/config.yaml".text = '' models: + "Qwen3.6-35B-A3B-GGUF": + cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q4_K_S --ctx-size 128000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -np 1 --fit-target 256 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 --no-kv-offload --chat-template-kwargs '{\"preserve_thinking\": true}'" + ttl: 2400 "Qwen3.5-35B-A3B-GGUF": cmd: llama-server --port ''${PORT} -hf mudler/Qwen3.5-35B-A3B-APEX-GGUF:Mini --ctx-size 128000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -np 1 --fit-target 256 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 --no-kv-offload ttl: 2400 From 4acde426e9322f1b5a59ee401633d384f5d78fe0 Mon Sep 17 00:00:00 2001 From: TheCrazyInsanity Date: Mon, 27 Apr 2026 17:23:21 -0400 Subject: [PATCH 2/2] kirk --- flake.lock | 53 +++++++++++----------- global/default.nix | 6 +-- home/bash.nix | 4 +- machines/homepc/configuration.nix | 6 ++- machines/homepc/hardware-configuration.nix | 8 ++-- modules/kde/default.nix | 1 - 6 files changed, 41 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 5b8c7a2..7708055 100755 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ ] }, "locked": { - "lastModified": 1771437256, - "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=", + "lastModified": 1776249299, + "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", "owner": "numtide", "repo": "blueprint", - "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33", + "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", "type": "github" }, "original": { @@ -46,15 +46,16 @@ ] }, "locked": { - "lastModified": 1770895533, - "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", - "owner": "nix-community", + "lastModified": 1776182890, + "narHash": "sha256-+/VOe8XGq5klpU+I19D+3TcaR7o+Cwbq67KNF7mcFak=", + "owner": "Mic92", "repo": "bun2nix", - "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", + "rev": "648d293c51e981aec9cb07ba4268bc19e7a8c575", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "Mic92", + "ref": "catalog-support", "repo": "bun2nix", "type": "github" } @@ -110,11 +111,11 @@ ] }, "locked": { - "lastModified": 1775143651, - "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", + "lastModified": 1776891022, + "narHash": "sha256-vEe2f4NEhMvaNDpM1pla4hteaIIGQyAMKUfIBPLasr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", + "rev": "508daf831ab8d1b143d908239c39a7d8d39561b2", "type": "github" }, "original": { @@ -189,11 +190,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775136683, - "narHash": "sha256-UWC+DqtcUiFxGS4Kc4AX5VNfKSKbUuZaFAVnPxcbZdM=", + "lastModified": 1776864758, + "narHash": "sha256-qQFek7fJDmMpwT0B1KlW+4DMjAlMYrLF0SbVRhkYqHI=", "owner": "Qumulo", "repo": "llm-agents", - "rev": "fd7a138b9649ec7868da78eb7a0db1fd7bd8bb37", + "rev": "a3532e7336c51044432a7d35a184510baf149a28", "type": "github" }, "original": { @@ -220,11 +221,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1775064974, - "narHash": "sha256-fp7+8MzxHrIixIIVvyORI2XpqpQnxf8NodmEHy8rczg=", + "lastModified": 1776329215, + "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ebfbc38bdc6b22822a6f991f2d922306f33cfbc", + "rev": "b86751bc4085f48661017fa226dee99fab6c651b", "type": "github" }, "original": { @@ -236,11 +237,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -260,11 +261,11 @@ ] }, "locked": { - "lastModified": 1774915545, - "narHash": "sha256-COT4l/+ZddGBvrDVfPf7MEOJxV8EDKame6/aRnNIKcY=", + "lastModified": 1775856943, + "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "f3177b3c69fb3f03201098d7fe8ab6422cce7fc1", + "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", "type": "github" }, "original": { @@ -306,11 +307,11 @@ ] }, "locked": { - "lastModified": 1773297127, - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { diff --git a/global/default.nix b/global/default.nix index faec720..b841256 100755 --- a/global/default.nix +++ b/global/default.nix @@ -32,13 +32,13 @@ blasSupport = true; }).overrideAttrs (oldAttrs: rec { - version = "8683"; + version = "8940"; src = pkgs.fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${version}"; # rev = "6ebf2e0d00d31acfc1a1fa9662e9a7d38bd07bf7"; # https://github.com/ggml-org/llama.cpp/pull/19970 - hash = "sha256-cehplQ4utj8h3zpUqjsXmNiW2g+YylcNbvaRYVRP2/U="; + hash = "sha256-JlJeNO7eID6JvxZMkck136mC/Rvd5v8320tAuQabzhU="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -46,7 +46,7 @@ ''; }; # Must update npm deps hash to match the new version's webui dependencies - npmDepsHash = "sha256-DxgUDVr+kwtW55C4b89Pl+j3u2ILmACcQOvOBjKWAKQ="; + npmDepsHash = "sha256-RAFtsbBGBjteCt5yXhrmHL39rIDJMCFBETgzId2eRRk="; # Enable native CPU optimizations for massively better CPU performance # This enables AVX, AVX2, AVX-512, FMA, etc. for your specific CPU # NOTE: This is intentionally opposite of nixpkgs (which uses -DGGML_NATIVE=off diff --git a/home/bash.nix b/home/bash.nix index 088a08d..36f4a20 100755 --- a/home/bash.nix +++ b/home/bash.nix @@ -1,4 +1,4 @@ -{...}: +{ ... }: { programs.bash = { enable = true; @@ -12,4 +12,4 @@ activate-linux = "echo Done!"; # I am a shitposter at heart }; }; -} \ No newline at end of file +} diff --git a/machines/homepc/configuration.nix b/machines/homepc/configuration.nix index 9c002f7..a542063 100755 --- a/machines/homepc/configuration.nix +++ b/machines/homepc/configuration.nix @@ -48,6 +48,7 @@ pkgs.opencode pkgs.llama-cpp pkgs.llama-swap + # pkgs.agent-browser inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.pi inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.rtk @@ -91,7 +92,10 @@ environment.etc."llama-swap/config.yaml".text = '' models: "Qwen3.6-35B-A3B-GGUF": - cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q4_K_S --ctx-size 128000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -np 1 --fit-target 256 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 --no-kv-offload --chat-template-kwargs '{\"preserve_thinking\": true}'" + cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q4_K_S --ctx-size 128000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -np 1 --fit-target 256 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 --chat-template-kwargs '{\"preserve_thinking\": true}'" + ttl: 2400 + "Qwen3.6-35B-A3B-FLASH": + cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.6-35B-A3B-GGUF:UD-Q3_K_M --ctx-size 128000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -np 1 --fit-target 256 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 --chat-template-kwargs '{\"preserve_thinking\": true}'" ttl: 2400 "Qwen3.5-35B-A3B-GGUF": cmd: llama-server --port ''${PORT} -hf mudler/Qwen3.5-35B-A3B-APEX-GGUF:Mini --ctx-size 128000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -np 1 --fit-target 256 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 --no-kv-offload diff --git a/machines/homepc/hardware-configuration.nix b/machines/homepc/hardware-configuration.nix index 0fd0b60..48693ac 100755 --- a/machines/homepc/hardware-configuration.nix +++ b/machines/homepc/hardware-configuration.nix @@ -93,10 +93,10 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; - nix.settings = { - substituters = [ "https://cache.nixos-cuda.org" ]; - trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ]; - }; + # nix.settings = { + # substituters = [ "https://cache.nixos-cuda.org" ]; + # trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ]; + # }; system.stateVersion = "24.11"; # No touchy } diff --git a/modules/kde/default.nix b/modules/kde/default.nix index 4b05cad..08ddcb8 100755 --- a/modules/kde/default.nix +++ b/modules/kde/default.nix @@ -17,7 +17,6 @@ programs.firefox = { enable = true; policies.ExtensionSettings = { - "*".installation_mode = "blocked"; # blocks all addons except the ones specified below # uBlock Origin: "uBlock0@raymondhill.net" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";