updates
This commit is contained in:
+1
-1
@@ -17,7 +17,7 @@
|
||||
./stylix.nix
|
||||
|
||||
#graphical
|
||||
./fuzzel.nix
|
||||
#./fuzzel.nix #depracted by noctalia v5 now with fuzzy search as well
|
||||
./niri.nix
|
||||
./noctalia.nix
|
||||
./wallpapers.nix
|
||||
|
||||
+2
-3
@@ -405,9 +405,8 @@ in
|
||||
#"Mod+T".action.spawn = noctalia "plugin togglePanel notes-scratchpad";
|
||||
#"Mod+A".action.spawn = noctalia "plugin:assistant-panel open";
|
||||
|
||||
# Noctalia launcher
|
||||
#"Mod+D".action.spawn = noctalia "launcher toggle";
|
||||
"Mod+D".action.spawn = "fuzzel";
|
||||
#"Mod+D".action.spawn = "fuzzel";
|
||||
"Mod+D".action.spawn = noctalia "panel-toggle launcher";
|
||||
"Mod+Space".action.spawn = noctalia "panel-toggle launcher";
|
||||
"Mod+O".action.toggle-window-rule-opacity = { };
|
||||
# Noctalia lock screen
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
vim
|
||||
wget
|
||||
bottom
|
||||
nvtopPackages.full
|
||||
|
||||
@@ -17,9 +17,12 @@
|
||||
#inputs.self.packages.${system}.fish-speech-models
|
||||
];
|
||||
|
||||
services.lact.enable = lib.mkDefault true;
|
||||
|
||||
services.llama-swap = {
|
||||
enable = true;
|
||||
package = inputs.self.packages.${system}.llama-swap;
|
||||
listenAddress = "0.0.0.0";
|
||||
port = 11112;
|
||||
openFirewall = true;
|
||||
|
||||
@@ -90,7 +93,7 @@
|
||||
cmd = "${llama-server} --port $\{PORT\} --host 0.0.0.0 --ctx-size $\{ctx\} -fa 0 -ngl $\{ngl\} --hf-repo $\{hf_repo\} $\{tools\}";
|
||||
ttl = 900;
|
||||
macros = {
|
||||
hf_repo = "unsloth/gemma-4-12B-it-GGUF";
|
||||
hf_repo = "unsloth/gemma-4-12B-it-qat-GGUF:UD_Q4_K_XL";
|
||||
ctx = 128000;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -83,13 +83,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp-nightly";
|
||||
version = "9222";
|
||||
version = "9665";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-Ws0a2qkgTFoeUuzg6tKbY6PfDP+0/9D9DTx21fLoFak=";
|
||||
hash = "sha256-RDE5+WP2Z2nQN7w/OeDmfaoRANBnYtgp0NQ9mMn0QmI=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C "$out" rev-parse --short HEAD > $out/COMMIT
|
||||
|
||||
@@ -6,25 +6,18 @@
|
||||
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "llama-cpp-nightly-ui";
|
||||
version = "9222";
|
||||
version = "9665";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggml-org";
|
||||
repo = "llama.cpp";
|
||||
tag = "b${finalAttrs.version}";
|
||||
hash = "sha256-Ws0a2qkgTFoeUuzg6tKbY6PfDP+0/9D9DTx21fLoFak=";
|
||||
hash = "sha256-eMRNWunJyv2dsc6NmRDEDgXh7JCMT6fV1g9IrNOA6NU=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/tools/ui";
|
||||
|
||||
npmDepsHash = "sha256-Po5SWJv3vmcBR7y62G9/CfvI3Lk/MYdjFMTTy2dsgoY=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace svelte.config.js \
|
||||
--replace-fail "../../build/tools/ui/dist" "./dist"
|
||||
substituteInPlace scripts/vite-plugin-llama-cpp-build.ts \
|
||||
--replace-fail "../../build/tools/ui/dist" "./dist"
|
||||
'';
|
||||
npmDepsHash = "sha256-T6CpsyZ1zxU9uEr/9JcmABCrtaB9aCz2EpdTS0IJzX0=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -18,7 +18,7 @@ let
|
||||
in
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "llama-swap";
|
||||
version = "216";
|
||||
version = "226";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
|
||||
owner = "mostlygeek";
|
||||
repo = "llama-swap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PHSY4z2h406xL+EcIYyrzr4s28txO7SCsWm8hrXf+2U=";
|
||||
hash = "sha256-V0Wev8EpjMSmMqHXJjKJ7SAKobN69232CjghTjyZXfU=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
cd "$out"
|
||||
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
|
||||
'';
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QysQ7YdwJcLTziwL25j73n3tQVvzVQIFxN4GkTU8JZg=";
|
||||
vendorHash = "sha256-w27S9JQyEMKc0dUkL9ATFXhh0jaEneb55neoNdFn/68=";
|
||||
|
||||
passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; };
|
||||
|
||||
@@ -58,7 +58,7 @@ buildGoModule (finalAttrs: {
|
||||
preBuild = ''
|
||||
ldflags+=" -X main.commit=$(cat COMMIT)"
|
||||
ldflags+=" -X main.date=$(cat SOURCE_DATE_EPOCH)"
|
||||
cp -r ${finalAttrs.passthru.ui}/ui_dist proxy/
|
||||
cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/
|
||||
'';
|
||||
|
||||
excludedPackages = [
|
||||
|
||||
@@ -13,14 +13,14 @@ buildNpmPackage (finalAttrs: {
|
||||
owner = "mostlygeek";
|
||||
repo = "llama-swap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-FuGy+5Ziu4zIheiYzH9GwbkKXzMibR0VlagTNTcSp4A=";
|
||||
hash = "sha256-w27S9JQyEMKc0dUkL9ATFXhh0jaEneb55neoNdFn/68=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-NJqEJ+XTdpPFtJJxP4CGu+JDUW7lKDcFgsixQJ3SXtQ=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace vite.config.ts \
|
||||
--replace-fail "../proxy/ui_dist" "${placeholder "out"}/ui_dist"
|
||||
--replace-fail "../internal/server/ui_dist" "${placeholder "out"}/ui_dist"
|
||||
'';
|
||||
|
||||
sourceRoot = "source/ui-svelte";
|
||||
|
||||
Reference in New Issue
Block a user