From 3653e06c7dd1b8ae5dd962063837daba168a21f7 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 7 Apr 2025 14:33:34 -0400
Subject: [PATCH] create single function to optimize for system

---
 flake.nix              | 10 +++++++++-
 services/llama-cpp.nix | 14 +++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index a015c48..dd76a8b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,7 +135,7 @@
     {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
       nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
-        specialArgs = {
+        specialArgs = rec {
           inherit
             username
             hostname
@@ -160,6 +160,14 @@
                 # stdenv = pkgs.clang19Stdenv;
               }
             );
+
+          optimizePackage =
+            pkg:
+            optimizeWithFlags pkg [
+              "-O3"
+              "-march=znver2"
+              "-mtune=znver2"
+            ];
         };
         modules =
           [
diff --git a/services/llama-cpp.nix b/services/llama-cpp.nix
index 78eb239..81a2918 100644
--- a/services/llama-cpp.nix
+++ b/services/llama-cpp.nix
@@ -3,7 +3,7 @@
   service_configs,
   config,
   inputs,
-  optimizeWithFlags,
+  optimizePackage,
   ...
 }:
 {
@@ -22,17 +22,13 @@
     port = service_configs.ports.llama_cpp;
     host = "0.0.0.0";
     package = (
-      optimizeWithFlags
-        (inputs.llamacpp.packages.${pkgs.system}.default.overrideAttrs (old: {
+      optimizePackage (
+        inputs.llamacpp.packages.${pkgs.system}.default.overrideAttrs (old: {
           cmakeFlags = old.cmakeFlags ++ [
             "-DGGML_AVX2=ON"
           ];
-        }))
-        [
-          "-O3"
-          "-march=znver2"
-          "-mtune=znver2"
-        ]
+        })
+      )
     );
     extraFlags = [
       "--flash-attn"