Compare commits
2 Commits
9b08d81ab0
...
72747120fa
| Author | SHA1 | Date | |
|---|---|---|---|
| 72747120fa | |||
| f3d27c2f33 |
49
flake.lock
generated
49
flake.lock
generated
@@ -45,16 +45,15 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777369708,
|
||||
"narHash": "sha256-1xW7cRZNsFNPQD+cE0fwnLVStnDth0HSoASEIFeT7uI=",
|
||||
"lastModified": 1778446047,
|
||||
"narHash": "sha256-oQvcadh2BCkrog+SGrG6YffKJrveYpjj3TdQJWaKhaM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "bun2nix",
|
||||
"rev": "e659e1cc4b8e1b21d0aa85f1c481f9db61ecfa98",
|
||||
"rev": "f2bc12af1a6369648aac41041ceeaa0b866599c6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "staging-2.1.0",
|
||||
"repo": "bun2nix",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -67,11 +66,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777988971,
|
||||
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
|
||||
"lastModified": 1778716662,
|
||||
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
|
||||
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -90,11 +89,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1777767341,
|
||||
"narHash": "sha256-lV2i2hBWxUKU2dgHza9SGfizOsV+uUcTQD/De+6/X3M=",
|
||||
"lastModified": 1779668702,
|
||||
"narHash": "sha256-voOAZYH429fsPg2PBRXtHP0yWXhtGOmTfl0I03uNwfA=",
|
||||
"owner": "glide-browser",
|
||||
"repo": "glide.nix",
|
||||
"rev": "790c9d37e3dcf9bb04ae4486a0320b999a8eec32",
|
||||
"rev": "287f90235434f7e574dccebed3a4caa1ca443d1d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -110,11 +109,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778248595,
|
||||
"narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=",
|
||||
"lastModified": 1780679734,
|
||||
"narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d",
|
||||
"rev": "b2b7db486e06e098711dc291bb25db82850e1d16",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -174,11 +173,11 @@
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1778247177,
|
||||
"narHash": "sha256-ZSe9r9xbx72NnBCCiC1UZxmIFzFA9IPno10Esp1kjiE=",
|
||||
"lastModified": 1780752723,
|
||||
"narHash": "sha256-4SdybfG4ZqFVJleInUHP17WTsGoYwOPiiW7pYHnt4iY=",
|
||||
"owner": "Qumulo",
|
||||
"repo": "llm-agents",
|
||||
"rev": "02444d83933d3ca28c9fd5d0be28812bdcf1232e",
|
||||
"rev": "3b444764a3f262bfe0e84e07882313271eee0b70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -205,11 +204,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1778124196,
|
||||
"narHash": "sha256-pYEytCNic/czazbV9r3tbQ6BZzqRBg/41x2dIC5ymOo=",
|
||||
"lastModified": 1780365719,
|
||||
"narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "68a8af93ff4297686cb68880845e61e5e2e41d92",
|
||||
"rev": "ffa10e26ae11d676b2db836259889f1f571cb14f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -221,11 +220,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"lastModified": 1780243769,
|
||||
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -291,11 +290,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1775636079,
|
||||
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
|
||||
"lastModified": 1780220602,
|
||||
"narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||
"rev": "db947814a175b7ca6ded66e21383d938df01c227",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -59,6 +59,7 @@
|
||||
|
||||
home-manager.users.laythe = import ./machines/homepc/home.nix;
|
||||
home-manager.sharedModules = [ plasma-manager.homeModules.plasma-manager ];
|
||||
home-manager.backupFileExtension = "backup";
|
||||
}
|
||||
];
|
||||
};
|
||||
@@ -76,6 +77,7 @@
|
||||
|
||||
home-manager.users.laythe = import ./machines/workstation/home.nix;
|
||||
home-manager.sharedModules = [ plasma-manager.homeModules.plasma-manager ];
|
||||
home-manager.backupFileExtension = "backup";
|
||||
}
|
||||
];
|
||||
};
|
||||
@@ -92,6 +94,7 @@
|
||||
|
||||
home-manager.users.laythe = import ./machines/latitude/home.nix;
|
||||
home-manager.sharedModules = [ plasma-manager.homeModules.plasma-manager ];
|
||||
home-manager.backupFileExtension = "backup";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
@@ -35,13 +35,13 @@
|
||||
blasSupport = true;
|
||||
}).overrideAttrs
|
||||
(oldAttrs: rec {
|
||||
version = "8940";
|
||||
version = "9653";
|
||||
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-JlJeNO7eID6JvxZMkck136mC/Rvd5v8320tAuQabzhU=";
|
||||
hash = "sha256-5LuuO9Qa5N676ieQ1a9VFfzQFaE6J+ToPm0oM9h3vmU=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
@@ -49,7 +49,7 @@
|
||||
'';
|
||||
};
|
||||
# Must update npm deps hash to match the new version's webui dependencies
|
||||
npmDepsHash = "sha256-RAFtsbBGBjteCt5yXhrmHL39rIDJMCFBETgzId2eRRk=";
|
||||
npmDepsHash = "sha256-T6CpsyZ1zxU9uEr/9JcmABCrtaB9aCz2EpdTS0IJzX0=";
|
||||
# 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
|
||||
@@ -235,8 +235,7 @@
|
||||
nasctui
|
||||
trilium-desktop
|
||||
haruna
|
||||
(pkgs.runCommand "nvenc-compress" { nativeBuildInputs = [ pkgs.bash ]; }
|
||||
''
|
||||
(pkgs.runCommand "nvenc-compress" { nativeBuildInputs = [ pkgs.bash ]; } ''
|
||||
mkdir -p $out/bin
|
||||
cp ${./nvenc_compress.sh} $out/bin/nvenc-compress
|
||||
chmod +x $out/bin/nvenc-compress
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
# Configure network connections interactively with nmcli or nmtui.
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
virtualization.podman.enableNvidia = true;
|
||||
# virtualization.podman.enableNvidia = true;
|
||||
|
||||
# Only computer I own that can actually run ollama, and I don't want to make an ai folder.
|
||||
# services.ollama = {
|
||||
@@ -46,7 +46,7 @@
|
||||
# And this config is getting a bit complicated for a single pc config
|
||||
# Should be moved to it's own shit
|
||||
environment.systemPackages = [
|
||||
pkgs.ollama-cuda
|
||||
# pkgs.ollama-cuda
|
||||
pkgs.opencode
|
||||
pkgs.llama-cpp
|
||||
pkgs.llama-swap
|
||||
@@ -57,16 +57,16 @@
|
||||
inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.rtk
|
||||
];
|
||||
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
package = pkgs.ollama-cuda;
|
||||
environmentVariables = {
|
||||
OLLAMA_NUM_PARALLEL = "1";
|
||||
OLLAMA_FLASH_ATTENTION = "1";
|
||||
OLLAMA_KV_CACHE_TYPE = "q4_0";
|
||||
OLLAMA_CONTEXT_LENGTH = "16384";
|
||||
};
|
||||
};
|
||||
# services.ollama = {
|
||||
# enable = true;
|
||||
# package = pkgs.ollama-cuda;
|
||||
# environmentVariables = {
|
||||
# OLLAMA_NUM_PARALLEL = "1";
|
||||
# OLLAMA_FLASH_ATTENTION = "1";
|
||||
# OLLAMA_KV_CACHE_TYPE = "q4_0";
|
||||
# OLLAMA_CONTEXT_LENGTH = "16384";
|
||||
# };
|
||||
# };
|
||||
|
||||
# Configure llama-swap as a systemd service
|
||||
systemd.services.llama-swap = {
|
||||
@@ -124,11 +124,11 @@
|
||||
"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"
|
||||
ttl: 300
|
||||
"Gemma4-E4B":
|
||||
cmd: "llama-server --port ''${PORT} -hf Abhiray/gemma-4-E4B-it-heretic-GGUF:Q4_K_M --ctx-size 64000 --temp 0.7 --top-p 0.8 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256"
|
||||
"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}'"
|
||||
ttl: 300
|
||||
"Qwen3.5-0.8B-Non-Thinking":
|
||||
cmd: "llama-server --port ''${PORT} -hf unsloth/Qwen3.5-0.8B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.7 --top-p 0.8 --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-0.8B-GGUF:Q4_K_M --ctx-size 64000 --temp 0.7 --top-p 0.8 --top-k 20 --min-p 0.00 -fa on --jinja -kvu -np 1 --fit-target 256 --chat-template-kwargs '{\"enable_thinking\": false}'"
|
||||
ttl: 300'';
|
||||
|
||||
# Set your time zone.
|
||||
@@ -146,6 +146,14 @@
|
||||
# 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
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
environment.systemPackages = with pkgs; [
|
||||
antigravity # Free Gemini 3 credits was too good of an offer to not take up, even if it requires selling my soul.
|
||||
chromium
|
||||
# vscode
|
||||
];
|
||||
|
||||
home-manager.sharedModules = [
|
||||
@@ -13,6 +14,7 @@
|
||||
enable = true;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
jnoortheen.nix-ide
|
||||
continue.continue
|
||||
];
|
||||
userSettings = {
|
||||
"editor.formatOnSave" = true;
|
||||
|
||||
Reference in New Issue
Block a user