From 7dfe3bcf275731e343bc8fc4c497268cbb4059e5 Mon Sep 17 00:00:00 2001 From: Adrian Gunnar Lauterer Date: Wed, 20 May 2026 00:17:06 +0200 Subject: [PATCH] format --- flake.nix | 59 ++++++++++++---------- home/noctalia.nix | 4 +- hosts/galadriel/hardware-configuration.nix | 4 +- modules/llama-swap.nix | 6 ++- 4 files changed, 41 insertions(+), 32 deletions(-) diff --git a/flake.nix b/flake.nix index 80b1425..d445e7f 100644 --- a/flake.nix +++ b/flake.nix @@ -94,34 +94,39 @@ ; }; - overlays.custom = final: _prev: let - unstable-pkgs = import inputs.unstable { inherit (final.stdenv.hostPlatform) system; }; - in { - custom = { - qwen-asr = final.callPackage ./packages/qwen-asr { }; - llama-swap = final.callPackage ./packages/llama-swap { buildGoModule = unstable-pkgs.buildGoModule; }; - z-image-models = final.callPackage ./packages/z-image-models { }; - whisper-models = final.callPackage ./packages/whisper-models { }; - s2cpp = final.callPackage ./packages/s2cpp { }; - s2-model = final.callPackage ./packages/s2-model { }; - vllm-omni = final.python3Packages.callPackage ./packages/vllm-omni { }; - llama-cpp-ui = final.callPackage ./packages/llama-cpp-nightly/ui.nix { }; - llama-cpp-nightly = final.callPackage ./packages/llama-cpp-nightly { - uiAssets = final.custom.llama-cpp-ui; + overlays.custom = + final: _prev: + let + unstable-pkgs = import inputs.unstable { inherit (final.stdenv.hostPlatform) system; }; + in + { + custom = { + qwen-asr = final.callPackage ./packages/qwen-asr { }; + llama-swap = final.callPackage ./packages/llama-swap { + buildGoModule = unstable-pkgs.buildGoModule; + }; + z-image-models = final.callPackage ./packages/z-image-models { }; + whisper-models = final.callPackage ./packages/whisper-models { }; + s2cpp = final.callPackage ./packages/s2cpp { }; + s2-model = final.callPackage ./packages/s2-model { }; + vllm-omni = final.python3Packages.callPackage ./packages/vllm-omni { }; + llama-cpp-ui = final.callPackage ./packages/llama-cpp-nightly/ui.nix { }; + llama-cpp-nightly = final.callPackage ./packages/llama-cpp-nightly { + uiAssets = final.custom.llama-cpp-ui; + }; + llama-cpp-nightly-vulkan = final.callPackage ./packages/llama-cpp-nightly { + vulkanSupport = true; + uiAssets = final.custom.llama-cpp-ui; + }; + llama-cpp-nightly-sycl = final.callPackage ./packages/llama-cpp-nightly { + syclSupport = true; + mkl = final.mkl; + oneDNN = final.oneDNN; + uiAssets = final.custom.llama-cpp-ui; + }; + android-cli = final.callPackage ./packages/android-cli { }; }; - llama-cpp-nightly-vulkan = final.callPackage ./packages/llama-cpp-nightly { - vulkanSupport = true; - uiAssets = final.custom.llama-cpp-ui; - }; - llama-cpp-nightly-sycl = final.callPackage ./packages/llama-cpp-nightly { - syclSupport = true; - mkl = final.mkl; - oneDNN = final.oneDNN; - uiAssets = final.custom.llama-cpp-ui; - }; - android-cli = final.callPackage ./packages/android-cli { }; }; - }; overlays.unstable = final: _prev: { unstable = import inputs.unstable { @@ -225,7 +230,7 @@ lanzaboote.nixosModules.lanzaboote - ]; + ]; }; # galadriel diff --git a/home/noctalia.nix b/home/noctalia.nix index f8db5f2..29a8151 100644 --- a/home/noctalia.nix +++ b/home/noctalia.nix @@ -176,13 +176,13 @@ ai = { provider = "openai_compatible"; models = { - "openai_compatible" = "qwen3.5"; + "openai_compatible" = "qwen3.6"; }; #apiKeys = {}; temperature = 0.6; systemPrompt = "You are a helpful assistant answering short questions. Be brief, think critically and come with constructual critics where needed."; openaiLocal = true; - openaiBaseUrl = "http://galadriel:11111/v1/chat/completions"; + openaiBaseUrl = "http://galadriel:11112/v1/chat/completions"; }; translator = { backend = "google"; diff --git a/hosts/galadriel/hardware-configuration.nix b/hosts/galadriel/hardware-configuration.nix index dc91da3..6d9033f 100644 --- a/hosts/galadriel/hardware-configuration.nix +++ b/hosts/galadriel/hardware-configuration.nix @@ -22,10 +22,10 @@ "usbhid" "sd_mod" ]; - + # unstable zfs and linux because we needed zfs 2.4.2 for linux 7.0 boot.kernelPackages = pkgs.unstable.linuxPackages_7_0; # migth need to bump down if zfs compat breaks. - boot.zfs.package = pkgs.unstable.zfs; #think this was the correct way + boot.zfs.package = pkgs.unstable.zfs; # think this was the correct way boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; diff --git a/modules/llama-swap.nix b/modules/llama-swap.nix index 74c71a1..0d75d08 100644 --- a/modules/llama-swap.nix +++ b/modules/llama-swap.nix @@ -54,7 +54,11 @@ "qwen3.6-35b-a3b" = { cmd = "${llama-server} --port $\{PORT\} --host 0.0.0.0 --ctx-size $\{ctx\} -ngl $\{ngl\} $\{kv_cache\} $\{batch\} --hf-repo $\{hf_repo\} $\{image-tokens\} $\{no-thinking\} $\{tools\}"; - aliases = [ "qwen3.6" "qwen3.5" "qwen3.5-35b-a3b" ]; + aliases = [ + "qwen3.6" + "qwen3.5" + "qwen3.5-35b-a3b" + ]; ttl = 1800; macros = { ctx = 49152;