update

NOTES.md

@@ -0,0 +1,7 @@
+## List drives in external usb bay
+
+fish shell script:
+```fish
+find /dev/disk/by-id -name "usb*" | grep -v "part[0-9]\$" | while read drive; lsblk -no model,serial $drive | head -n1 | tr -d '\n' | tr " " "_" && echo -e " $(echo $drive | cut -d':' -f2-)"; end | column -t --table-columns=DRIVE,BAY | sort -n -k 2
+```
+

configuration.nix

@@ -28,7 +28,7 @@
     # ./services/owntracks.nix
     ./services/soulseek.nix
 
-    # ./services/llama-cpp.nix
+    ./services/llama-cpp.nix
   ];
 
   systemd.targets = {

flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748225455,
+        "lastModified": 1748832438,
-        "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
+        "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
+        "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748455876,
+        "lastModified": 1748665073,
-        "narHash": "sha256-4n9uDN54LSgN7WVEzj2r0nBthV5m0uFi9BgiD0dfS54=",
+        "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "529d2aac542a42c57d4b765501ace564b07e3d99",
+        "rev": "282e1e029cb6ab4811114fc85110613d72771dea",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748469020,
+        "lastModified": 1748908498,
-        "narHash": "sha256-tPOsjGyTYcSa5c/X/iNAdXEEdgrZ4hW6eirbqwuu+ZM=",
+        "narHash": "sha256-BmdtmB9GXqlUYvsDYN39LWkM+lEj+8FpS4TwBUvSMbs=",
         "owner": "ggml-org",
         "repo": "llama.cpp",
-        "rev": "53ae30640e131082d8d19bd80485b47c4553d551",
+        "rev": "71e74a3ac929b8af91f16f73f3c2b9b2f796d207",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748484226,
+        "lastModified": 1748916347,
-        "narHash": "sha256-EEAoks/XEcA1c+PPkgqHfG0gU20Vsv4AVNRZw94+2d8=",
+        "narHash": "sha256-eIy97tvwFpLYsKX9uuALUyheoab+1HvIG0DHjxuY1bE=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "89004e07d97d2fa1113bbcc51a9ed1abea5b3371",
+        "rev": "ba53b41891daed8bea64bb32c12a98f159bcca9b",
         "type": "github"
       },
       "original": {
@@ -237,11 +237,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1747900541,
+        "lastModified": 1748634340,
-        "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
+        "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
+        "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
         "type": "github"
       },
       "original": {
@@ -253,11 +253,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1748302896,
+        "lastModified": 1748889542,
-        "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=",
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
         "type": "github"
       },
       "original": {

services/llama-cpp.nix

@@ -12,17 +12,17 @@
     enable = true;
     model = builtins.toString (
       pkgs.fetchurl {
-        url = "https://huggingface.co/jedisct1/MiMo-7B-RL-GGUF/resolve/main/MiMo-7B-RL-Q4_K_M.gguf";
+        url = "https://huggingface.co/bartowski/nvidia_AceReason-Nemotron-7B-GGUF/resolve/main/nvidia_AceReason-Nemotron-7B-Q8_0.gguf";
-        sha256 = "9142f02e34f64da37ae411dbde4059f5e5aac8aba32f261608d1c6f79f0c2eae";
+        sha256 = "0d5eb8b46490af7c097357cb20ad215ebfd30efacedac58bf68a8c7d84e996fc";
       }
     );
     port = service_configs.ports.llama_cpp;
     host = "0.0.0.0";
-    package = (optimizePackage inputs.llamacpp.packages.${pkgs.system}.vulkan);
+    # vulkan broken: https://github.com/ggml-org/llama.cpp/issues/13801
+    package = (optimizePackage inputs.llamacpp.packages.${pkgs.system}.default);
     extraFlags = [
-      "--flash-attn"
+      # "-ngl"
-      "-ngl"
+      # "9999"
-      "9999"
     ];
   };
 

services/minecraft.nix

@@ -63,8 +63,8 @@
           with pkgs;
           builtins.attrValues {
             FabricApi = fetchurl {
-              url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/vcgUMTb2/fabric-api-0.124.0%2B1.21.5.jar";
+              url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/1Hweb6k1/fabric-api-0.125.3%2B1.21.5.jar";
-              sha512 = "674c876eb68e00fd19c3644286ea76380b639df068d51de77439d20c8abeb9460bfafe7d6e1dd6bedbcbcd500356a17f89488b73cd832a4599ee091700c7fad4";
+              sha512 = "54d1c195803de90a7055858ab835d527919007f0e80048e854d3beaaad151d30766a78f530a4189eadfbbef3bd98cca69c9f54f565d49b586180cbd5834eda97";
             };
 
             FerriteCore = fetchurl {