Compare commits
3 Commits
ca3c740b66
...
ac5425e5b1
| Author | SHA1 | Date | |
|---|---|---|---|
| ac5425e5b1 | |||
| 77c77a298b | |||
| 00ebec0062 |
38
flake.lock
generated
38
flake.lock
generated
@@ -67,11 +67,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772408722,
|
"lastModified": 1775087534,
|
||||||
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -87,11 +87,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772845525,
|
"lastModified": 1775143651,
|
||||||
"narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
|
"narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
|
"rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -166,11 +166,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773322058,
|
"lastModified": 1775136683,
|
||||||
"narHash": "sha256-xYQ32BrphBupOi+rTm3XF3URFEmH0kHYVRi58fMER0I=",
|
"narHash": "sha256-UWC+DqtcUiFxGS4Kc4AX5VNfKSKbUuZaFAVnPxcbZdM=",
|
||||||
"owner": "Qumulo",
|
"owner": "Qumulo",
|
||||||
"repo": "llm-agents",
|
"repo": "llm-agents",
|
||||||
"rev": "efdf1f01a8474c3c6c2d0f95a66c97b1baec4dc7",
|
"rev": "fd7a138b9649ec7868da78eb7a0db1fd7bd8bb37",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -197,11 +197,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773201692,
|
"lastModified": 1775064974,
|
||||||
"narHash": "sha256-NXrKzNMniu4Oam2kAFvqJ3GB2kAvlAFIriTAheaY8hw=",
|
"narHash": "sha256-fp7+8MzxHrIixIIVvyORI2XpqpQnxf8NodmEHy8rczg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b6067cc0127d4db9c26c79e4de0513e58d0c40c9",
|
"rev": "6ebfbc38bdc6b22822a6f991f2d922306f33cfbc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -213,11 +213,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772773019,
|
"lastModified": 1775036866,
|
||||||
"narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
|
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
|
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -237,11 +237,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767662275,
|
"lastModified": 1774915545,
|
||||||
"narHash": "sha256-d5Q1GmQ+sW1Bt8cgDE0vOihzLaswsm8cSdg8124EqXE=",
|
"narHash": "sha256-COT4l/+ZddGBvrDVfPf7MEOJxV8EDKame6/aRnNIKcY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "51816be33a1ff0d4b22427de83222d5bfa96d30e",
|
"rev": "f3177b3c69fb3f03201098d7fe8ab6422cce7fc1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -298,4 +298,4 @@
|
|||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
"version": 7
|
"version": 7
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,8 @@
|
|||||||
nixpkgs,
|
nixpkgs,
|
||||||
home-manager,
|
home-manager,
|
||||||
impermanence,
|
impermanence,
|
||||||
|
plasma-manager,
|
||||||
|
llm-agents,
|
||||||
# nix-flatpak,
|
# nix-flatpak,
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
|
|||||||
@@ -21,7 +21,6 @@
|
|||||||
nix.package = pkgs.lixPackageSets.stable.lix;
|
nix.package = pkgs.lixPackageSets.stable.lix;
|
||||||
|
|
||||||
nixpkgs.config.packageOverrides = pkgs: {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
|
|
||||||
# Stolen from https://www.nijho.lt/post/llama-nixos/
|
# Stolen from https://www.nijho.lt/post/llama-nixos/
|
||||||
llama-cpp =
|
llama-cpp =
|
||||||
(pkgs.llama-cpp.override {
|
(pkgs.llama-cpp.override {
|
||||||
@@ -33,13 +32,13 @@
|
|||||||
blasSupport = true;
|
blasSupport = true;
|
||||||
}).overrideAttrs
|
}).overrideAttrs
|
||||||
(oldAttrs: rec {
|
(oldAttrs: rec {
|
||||||
version = "8209";
|
version = "8660";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "ggml-org";
|
owner = "ggml-org";
|
||||||
repo = "llama.cpp";
|
repo = "llama.cpp";
|
||||||
tag = "b${version}";
|
tag = "b${version}";
|
||||||
# rev = "6ebf2e0d00d31acfc1a1fa9662e9a7d38bd07bf7"; # https://github.com/ggml-org/llama.cpp/pull/19970
|
# rev = "6ebf2e0d00d31acfc1a1fa9662e9a7d38bd07bf7"; # https://github.com/ggml-org/llama.cpp/pull/19970
|
||||||
hash = "sha256-7z9mQZ/hgNS+doLCVPtax+FBhr6dEfmR9wZJTwtl/pM=";
|
hash = "sha256-4QwFMHpaYeD+aul/p5XFBRYivJ6WgI1kxecbrqFml6o=";
|
||||||
leaveDotGit = true;
|
leaveDotGit = true;
|
||||||
postFetch = ''
|
postFetch = ''
|
||||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||||
@@ -47,7 +46,7 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
# Must update npm deps hash to match the new version's webui dependencies
|
# Must update npm deps hash to match the new version's webui dependencies
|
||||||
npmDepsHash = "sha256-FKjoZTKm0ddoVdpxzYrRUmTiuafEfbKc4UD2fz2fb8A=";
|
npmDepsHash = "sha256-DxgUDVr+kwtW55C4b89Pl+j3u2ILmACcQOvOBjKWAKQ=";
|
||||||
# Enable native CPU optimizations for massively better CPU performance
|
# Enable native CPU optimizations for massively better CPU performance
|
||||||
# This enables AVX, AVX2, AVX-512, FMA, etc. for your specific CPU
|
# This enables AVX, AVX2, AVX-512, FMA, etc. for your specific CPU
|
||||||
# NOTE: This is intentionally opposite of nixpkgs (which uses -DGGML_NATIVE=off
|
# NOTE: This is intentionally opposite of nixpkgs (which uses -DGGML_NATIVE=off
|
||||||
@@ -80,6 +79,8 @@
|
|||||||
"-DGGML_BLAS=ON" # Uses internal BLAS provided by Nix (blasSupport=true works)
|
"-DGGML_BLAS=ON" # Uses internal BLAS provided by Nix (blasSupport=true works)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = "";
|
||||||
|
|
||||||
# Disable Nix's NIX_ENFORCE_NO_NATIVE which strips -march=native flags
|
# Disable Nix's NIX_ENFORCE_NO_NATIVE which strips -march=native flags
|
||||||
# See: https://github.com/NixOS/nixpkgs/issues/357736
|
# See: https://github.com/NixOS/nixpkgs/issues/357736
|
||||||
# See: https://github.com/NixOS/nixpkgs/pull/377484 (intentionally contradicts this)
|
# See: https://github.com/NixOS/nixpkgs/pull/377484 (intentionally contradicts this)
|
||||||
@@ -228,6 +229,9 @@
|
|||||||
nixfmt
|
nixfmt
|
||||||
units
|
units
|
||||||
android-tools
|
android-tools
|
||||||
|
jq
|
||||||
|
nasctui
|
||||||
|
trilium-desktop
|
||||||
];
|
];
|
||||||
|
|
||||||
services.usbmuxd = {
|
services.usbmuxd = {
|
||||||
|
|||||||
@@ -91,7 +91,10 @@
|
|||||||
environment.etc."llama-swap/config.yaml".text = ''
|
environment.etc."llama-swap/config.yaml".text = ''
|
||||||
models:
|
models:
|
||||||
"Qwen3.5-35B-A3B-GGUF":
|
"Qwen3.5-35B-A3B-GGUF":
|
||||||
cmd: llama-server --port ''${PORT} -hf unsloth/Qwen3.5-35B-A3B-GGUF:UD-IQ4_XS --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
|
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 unsloth/gemma-4-26B-A4B-it-GGUF:UD-IQ4_XS --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
|
||||||
ttl: 2400
|
ttl: 2400
|
||||||
"Qwen3-1.7B-GGUF":
|
"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
|
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
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
{pkgs, ...}: {
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
blender
|
blender
|
||||||
# davinci-resolve
|
# davinci-resolve
|
||||||
shotcut
|
shotcut
|
||||||
glaxnimate
|
glaxnimate
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
|
krita
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kdePackages.kate
|
kdePackages.kate
|
||||||
kdePackages.filelight
|
kdePackages.filelight
|
||||||
|
thunderbird
|
||||||
# kdePackages.kdeconnect-kde
|
# kdePackages.kdeconnect-kde
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user