Merge pull request 'fix ollama, remove trr' (#190) from feature/ollama into main

Reviewed-on: #190

systems/artemision/configuration.nix

@@ -80,7 +80,6 @@
   users.users = {
     alice.extraGroups = [ "calibre-web" ];
   };
-  users.groups.ollama = { };
 
   system.stateVersion = "24.05";
 

systems/palatine-hill/docker/default.nix

@@ -20,7 +20,7 @@
     ./nextcloud.nix
     # ./postgres.nix
     # ./restic.nix
-    ./torr.nix
+    #./torr.nix
     # ./unifi.nix
   ];
 

systems/palatine-hill/docker/minecraft.nix

@@ -12,6 +12,7 @@ let
     rlcraft = "rlcraft.alicehuston.xyz";
     arcanum-institute = "arcanum.alicehuston.xyz";
     meits = "meits.alicehuston.xyz";
+    cobblemon-overclocked = "mco.alicehuston.xyz";
     # bcg-plus = "bcg.alicehuston.xyz";
     pii = "pii.alicehuston.xyz";
   };

systems/palatine-hill/ollama.nix

@@ -2,6 +2,9 @@
   pkgs,
   ...
 }:
+let
+  vars = import ./vars.nix;
+in
 {
   services = {
     ollama = {
@@ -20,6 +23,7 @@
         "qwen2.5-coder:1.5b-base"
         "nomic-embed-text:latest"
       ];
+      models = vars.primary_ollama;
       environmentVariables = {
         FLASH_ATTENTION = "1";
         OLLAMA_KV_CACHE_TYPE = "q8_0";
@@ -35,10 +39,12 @@
         # context length for agents
         OLLAMA_CONTEXT_LENGTH = "64000";
       };
+      openFirewall = true;
     };
     open-webui = {
       enable = true;
       port = 21212;
+      openFirewall = true;
     };
   };
   users.users.ollama = {
@@ -50,4 +56,16 @@
     isSystemUser = true;
   };
   users.groups.ollama = { };
+  systemd.services = {
+    ollama.serviceConfig = {
+      Nice = 19;
+      IOSchedulingPriority = 7;
+    };
+    ollama-model-loader.serviceConfig = {
+      Nice = 19;
+      CPUWeight = 50;
+      IOSchedulingClass = "idle";
+      IOSchedulingPriority = 7;
+    };
+  };
 }

systems/palatine-hill/vars.nix

@@ -19,4 +19,5 @@ rec {
   primary_torr = "${zfs_primary}/torr";
   primary_plex = "${zfs_primary}/plex";
   primary_plex_storage = "${zfs_primary}/plex_storage";
+  primary_ollama = "${zfs_primary}/ollama";
 }