jellyfin: remove packages from systemPackages

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
@@ -144,6 +144,30 @@
             inputs
             serviceMountDeps
             ;
+
+          # stolen from: https://stackoverflow.com/a/42398526
+          optimizeWithFlags =
+            pkg: flags:
+            nixpkgs.lib.overrideDerivation pkg (
+              old:
+              let
+                newflags = nixpkgs.lib.foldl' (acc: x: "${acc} ${x}") "" flags;
+                oldflags =
+                  if (nixpkgs.lib.hasAttr "NIX_CFLAGS_COMPILE" old) then "${old.NIX_CFLAGS_COMPILE}" else "";
+              in
+              {
+                NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}";
+                # stdenv = pkgs.clang19Stdenv;
+              }
+            );
+
+          optimizePackage =
+            pkg:
+            optimizeWithFlags pkg [
+              "-O3"
+              "-march=znver2"
+              "-mtune=znver2"
+            ];
         };
         modules =
           [

services/jellyfin.nix

@@ -4,6 +4,7 @@
   service_configs,
   username,
   serviceMountDeps,
+  optimizePackage,
   ...
 }:
 {
@@ -14,16 +15,17 @@
     ])
   ];
 
-  environment.systemPackages = with pkgs; [
-    jellyfin
-    jellyfin-web
-    jellyfin-ffmpeg
-  ];
+  # environment.systemPackages = with pkgs; [
+  #   jellyfin
+  #   jellyfin-web
+  #   jellyfin-ffmpeg
+  # ];
 
   services.jellyfin = {
     enable = true;
     # used for local streaming
     openFirewall = true;
+    package = pkgs.jellyfin.override { jellyfin-ffmpeg = (optimizePackage pkgs.jellyfin-ffmpeg); };
 
     dataDir = service_configs.jellyfin.dataDir;
     cacheDir = service_configs.jellyfin.cacheDir;

services/llama-cpp.nix

@@ -3,24 +3,9 @@
   service_configs,
   config,
   inputs,
+  optimizePackage,
   ...
 }:
-let
-  # stolen from: https://stackoverflow.com/a/42398526
-  optimizeWithFlags =
-    pkg: flags:
-    pkgs.lib.overrideDerivation pkg (
-      old:
-      let
-        newflags = pkgs.lib.foldl' (acc: x: "${acc} ${x}") "" flags;
-        oldflags = if (pkgs.lib.hasAttr "NIX_CFLAGS_COMPILE" old) then "${old.NIX_CFLAGS_COMPILE}" else "";
-      in
-      {
-        NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}";
-        stdenv = pkgs.clang19Stdenv;
-      }
-    );
-in
 {
   services.llama-cpp = {
     enable = true;
@@ -37,17 +22,13 @@ in
     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"

services/minecraft.nix

@@ -70,8 +70,8 @@
             };
 
             Lithium = fetchurl {
-              url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/nhc57Td2/lithium-fabric-0.16.0%2Bmc1.21.5.jar";
-              sha512 = "4be66cbb840501e9d7dfbcb6942daba6ce6b8f462694ee498d5c899e476e6d36697bcec70c49c818ca914571c70805de3d8b9a1e4c12c1bb7a3dc89dccbef17f";
+              url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/5YInGgMN/lithium-fabric-0.16.1%2Bmc1.21.5.jar";
+              sha512 = "3b723b7e3cb62f1b4b9f56c3acd4e0d0dd2cf02159cddf302c631a7141e4add447c5298b37a96e25a6432bdeb645b085cb59e489161f22bade139d1c6fdc4387";
             };
 
             NoChatReports = fetchurl {