ollamaPackages: rename {model}_{variant} -> {model}-{variant}

modules/services/ollama.nix

@@ -2,7 +2,8 @@
 # - <https://wiki.nixos.org/wiki/Ollama>
 #
 # use: `ollama run llama3.2`
-# or use a remote session: <https://github.com/ggozad/oterm>
+# - list available: `ollama list`
+# - use a remote session: <https://github.com/ggozad/oterm>
 #
 # models have to be explicitly downloaded. see `ollamaPackages` for examples.
 # should ollamaPackages not suffice, `ollama pull llama3.2` should fetch a model,
@@ -18,8 +19,13 @@ let
   modelSources = pkgs.symlinkJoin {
     name = "ollama-models";
     paths = with pkgs.ollamaPackages; [
-      llama3_2_3b
+      llama3_1-70b
+      llama3_2-3b
       mistral
+      mistral-large
+      mixtral-8x7b
+      qwen2_5-32b
+      qwen2_5-coder-7b
     ];
   };
   models = "${modelSources}/share/ollama/models";

pkgs/by-name/ollamaPackages/package.nix

@@ -9,11 +9,11 @@
 lib.recurseIntoAttrs (lib.makeScope newScope (self: with self; {
   mkOllamaModel = callPackage ./mkOllamaModel.nix { };
 
-  llama3_1_70b = callPackage ./llama3_1_70b.nix { };
-  llama3_2_3b = callPackage ./llama3_2_3b.nix { };
+  llama3_1-70b = callPackage ./llama3_1-70b.nix { };
+  llama3_2-3b = callPackage ./llama3_2-3b.nix { };
   mistral = callPackage ./mistral.nix { };
   mistral-large = callPackage ./mistral-large.nix { };
   mixtral-8x7b = callPackage ./mixtral-8x7b.nix { };
-  qwen2_5_32b = callPackage ./qwen2_5_32b.nix { };
+  qwen2_5-32b = callPackage ./qwen2_5-32b.nix { };
   qwen2_5-coder-7b = callPackage ./qwen2_5-coder-7b.nix { };
 }))