diff --git a/flake.lock b/flake.lock index 252ce72..badddea 100755 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,5 @@ { "nodes": { - "blueprint": { - "inputs": { - "nixpkgs": [ - "llm-agents", - "nixpkgs" - ], - "systems": [ - "llm-agents", - "systems" - ] - }, - "locked": { - "lastModified": 1776249299, - "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", - "owner": "numtide", - "repo": "blueprint", - "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "blueprint", - "type": "github" - } - }, "bun2nix": { "inputs": { "flake-parts": [ @@ -45,11 +20,11 @@ ] }, "locked": { - "lastModified": 1778446047, - "narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=", + "lastModified": 1782772816, + "narHash": "sha256-s9BuFv0mRuZx9C1MF8qPHRdcAK14ONi0A5m6E2wqOoM=", "owner": "nix-community", "repo": "bun2nix", - "rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6", + "rev": "5a39d717029e94163ac223aee8d5c9946cafed1c", "type": "github" }, "original": { @@ -66,11 +41,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -89,11 +64,11 @@ ] }, "locked": { - "lastModified": 1779668702, - "narHash": "sha256-voOAZYH429fsPg2PBRXtHP0yWXhtGOmTfl0I03uNwfA=", + "lastModified": 1782680989, + "narHash": "sha256-7OxxwIdXZRagnvsnVVp4Ju3Qhmht8hljiS8b7SfGOe4=", "owner": "glide-browser", "repo": "glide.nix", - "rev": "287f90235434f7e574dccebed3a4caa1ca443d1d", + "rev": "bba480c72761ded14314811c440c106360da5572", "type": "github" }, "original": { @@ -109,11 +84,11 @@ ] }, "locked": { - "lastModified": 1780679734, - "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=", + "lastModified": 1783963347, + "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", "owner": "nix-community", "repo": "home-manager", - "rev": "b2b7db486e06e098711dc291bb25db82850e1d16", + "rev": "a45a7c451455a51ae740ec3bce4024b312809c29", "type": "github" }, "original": { @@ -165,7 +140,6 @@ }, "llm-agents": { "inputs": { - "blueprint": "blueprint", "bun2nix": "bun2nix", "flake-parts": "flake-parts", "nixpkgs": "nixpkgs_2", @@ -173,11 +147,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1780752723, - "narHash": "sha256-4SdybfG4ZqFVJleInUHP17WTsGoYwOPiiW7pYHnt4iY=", + "lastModified": 1783950038, + "narHash": "sha256-NBCYYmvk6KjykP+/QPuzq3LpbzPxQcSIC1W5VLpF8S8=", "owner": "Qumulo", "repo": "llm-agents", - "rev": "3b444764a3f262bfe0e84e07882313271eee0b70", + "rev": "b38a42d0319fac9104d5f785816ae4971e0d48f3", "type": "github" }, "original": { @@ -204,11 +178,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780365719, - "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", + "lastModified": 1783816212, + "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", + "rev": "3b32825de172d0bc85664f495edb096b10862524", "type": "github" }, "original": { @@ -220,11 +194,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -244,11 +218,11 @@ ] }, "locked": { - "lastModified": 1775856943, - "narHash": "sha256-b7Mp7P+q2Md5AGt4rjHfMcBykzMumFTen10ST++AuTU=", + "lastModified": 1783574839, + "narHash": "sha256-ICof1tV4/9XheBLBGf7dhMhfMq4dOs1zwTHrr7zGFlA=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "a524a6160e6df89f7673ba293cf7d78b559eb1a5", + "rev": "c551f0687658e4bb699cfff6015436ad7ee57a0d", "type": "github" }, "original": { diff --git a/global/default.nix b/global/default.nix index 6abe958..2c38427 100755 --- a/global/default.nix +++ b/global/default.nix @@ -31,13 +31,14 @@ blasSupport = true; }).overrideAttrs (oldAttrs: rec { - version = "9653"; + version = "9591"; src = pkgs.fetchFromGitHub { - owner = "ggml-org"; + # owner = "ggml-org"; + owner = "PrismML-Eng"; repo = "llama.cpp"; - tag = "b${version}"; + tag = "prism-b9591-62061f9"; # rev = "6ebf2e0d00d31acfc1a1fa9662e9a7d38bd07bf7"; # https://github.com/ggml-org/llama.cpp/pull/19970 - hash = "sha256-5LuuO9Qa5N676ieQ1a9VFfzQFaE6J+ToPm0oM9h3vmU="; + hash = "sha256-zLxB5UKnCTCw/okB+L8u1VtM1o2yVjVYTlTBgL/BsaM="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -45,7 +46,7 @@ ''; }; # Must update npm deps hash to match the new version's webui dependencies - npmDepsHash = "sha256-T6CpsyZ1zxU9uEr/9JcmABCrtaB9aCz2EpdTS0IJzX0="; + npmDepsHash = "sha256-pjdbI6NcZRlJVd62xhgbLhWrwFYwgsIwjORqvo1+VD8="; # 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 @@ -236,6 +237,8 @@ cp ${./nvenc_compress.sh} $out/bin/nvenc-compress chmod +x $out/bin/nvenc-compress '') + cheese + yt-dlp ]; fonts.packages = with pkgs; [ @@ -251,6 +254,10 @@ package = pkgs.usbmuxd2; }; + systemd.settings.Manager = { + DefaultTimeoutStopSec = "10s"; + }; + nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/home/bash.nix b/home/bash.nix index 36f4a20..b8383f4 100755 --- a/home/bash.nix +++ b/home/bash.nix @@ -10,6 +10,7 @@ shellAliases = { activate-linux = "echo Done!"; # I am a shitposter at heart + lockin = "nix develop -c code . && nix develop"; }; }; } diff --git a/machines/homepc/configuration.nix b/machines/homepc/configuration.nix index a88e014..0cf48e0 100755 --- a/machines/homepc/configuration.nix +++ b/machines/homepc/configuration.nix @@ -54,6 +54,7 @@ pkgs.nvidia-container-toolkit inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.pi + inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.omp inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.rtk ]; @@ -94,17 +95,20 @@ # 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: + "Bonsai-27B": + cmd: "llama-server -hf prism-ml/Bonsai-27B-gguf:Q1_0 --port ''${PORT} -np 1 --ctx-size 64000 -ngl 999 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 -ctk q8_0 -ctv q8_0" + ttl: 2400 "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 --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}'" + 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 --no-mmap --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 "Gemma4-26B-A4B": - cmd: llama-server --port ''${PORT} -hf mudler/gemma-4-26B-A4B-it-heretic-APEX-GGUF:Mini --ctx-size 128000 --temp 1.0 --top-p 0.95 --top-k 64 --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 + cmd: llama-server --port ''${PORT} -hf unsloth/gemma-4-26B-A4B-it-qat-GGUF:UD-Q4_K_XL --ctx-size 128000 --temp 1 --top-p 0.95 --top-k 64 --min-p 0.00 -np 1 --fit-target 512 --ubatch-size 1024 -fa on --slots --slot-save-path /home/laythe/llamapcache --jinja -kvu --no-mmproj --swa-checkpoints 32 --no-mmap ttl: 2400 "Qwen3-1.7B-GGUF": cmd: llama-server --port ''${PORT} -hf unsloth/Qwen3-1.7B-GGUF:Q4_K_S --ctx-size 32768 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu @@ -122,7 +126,7 @@ cmd: "llama-server --port ''${PORT} -hf Jackrong/Qwen3.5-9B-Claude-4.6-Opus-Reasoning-Distilled-GGUF:Q4_K_S --ctx-size 32000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 512 --chat-template-kwargs '{\"enable_thinking\": true}' --no-mmproj" ttl: 300 "Qwen3.5-4B": - cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-4B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256" + cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-4B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.6 --top-p 0.95 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256 --chat-template-kwargs '{\"enable_thinking\": false}'" ttl: 300 "Gemma4-E2B": cmd: "llama-server --port ''${PORT} -hf unsloth/gemma-4-E2B-it-qat-GGUF:UD-Q4_K_XL --spec-type draft-mtp --spec-draft-n-max 4 --ctx-size 64000 --temp 1.0 --top-p 0.95 --top-k 64 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256 --chat-template-kwargs '{\"enable_thinking\": true}'" @@ -146,14 +150,6 @@ # useXkbConfig = true; # use xkb.options in tty. # }; - # services.hermes-agent = { - # enable = true; - # # settings.model.default = "anthropic/claude-sonnet-4"; - # environmentFiles = [ config.sops.secrets."hermes-env".path ]; - # addToSystemPackages = true; - # configFile = /etc/hermes/config.yaml; - # }; - services.xserver.enable = true; # On anything else modern this should be false. # Configure keymap in X11 diff --git a/modules/development/default.nix b/modules/development/default.nix index f54ce61..87c01cf 100755 --- a/modules/development/default.nix +++ b/modules/development/default.nix @@ -19,6 +19,7 @@ userSettings = { "editor.formatOnSave" = true; "git.autofetch" = true; + "git.enableSmartCommit" = true; }; }; } diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix index e725b9e..84adb91 100755 --- a/modules/gaming/default.nix +++ b/modules/gaming/default.nix @@ -13,5 +13,6 @@ ckan lutris prismlauncher + luanti ]; } diff --git a/modules/kde/default.nix b/modules/kde/default.nix index 08ddcb8..2f63be6 100755 --- a/modules/kde/default.nix +++ b/modules/kde/default.nix @@ -11,6 +11,7 @@ kdePackages.kate kdePackages.filelight thunderbird + kdePackages.kio-extras # kdePackages.kdeconnect-kde ];