From 29e3c29e3ab74c4a5e894e0e25e36df9016515f4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 25 Jun 2024 10:21:50 +0100
Subject: [PATCH] Enable ollama service for Tone

Enable GPU acceleration for ollama on Vanguard

Remove extra kernel / driver config from Northstar
---
 configuration/Northstar.nix | 21 +--------------------
 configuration/Tone.nix      |  1 +
 configuration/Vanguard.nix  |  8 ++++++--
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/configuration/Northstar.nix b/configuration/Northstar.nix
index 77d1b399..cc688d8c 100644
--- a/configuration/Northstar.nix
+++ b/configuration/Northstar.nix
@@ -1,20 +1 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [./laptop.nix];
-  boot = {
-    initrd.kernelModules = ["amdgpu"];
-    extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
-    extraModprobeConfig = ''
-      options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
-    '';
-  };
-  hardware.opengl = {
-    driSupport = true;
-    driSupport32Bit = true;
-    extraPackages = with pkgs; [amdvlk rocmPackages.clr.icd];
-    extraPackages32 = [pkgs.driversi686Linux.amdvlk];
-  };
-}
+{...}: {imports = [./laptop.nix];}
diff --git a/configuration/Tone.nix b/configuration/Tone.nix
index e3711647..dafa228f 100644
--- a/configuration/Tone.nix
+++ b/configuration/Tone.nix
@@ -14,6 +14,7 @@
     systemPackages = with pkgs; [openfortivpn];
   };
   services = {
+    ollama.enable = true;
     samba.enable = true;
     hardware.bolt.enable = true;
   };
diff --git a/configuration/Vanguard.nix b/configuration/Vanguard.nix
index 99b2e25f..f2fdf6f4 100644
--- a/configuration/Vanguard.nix
+++ b/configuration/Vanguard.nix
@@ -1,7 +1,6 @@
 {config, ...}: {
   imports = [./desktop.nix];
   boot = {
-    initrd.kernelModules = ["amdgpu"];
     extraModulePackages = with config.boot.kernelPackages; [v4l2loopback];
     extraModprobeConfig = ''
       options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
@@ -12,9 +11,14 @@
       driSupport = true;
       driSupport32Bit = true;
     };
+    amdgpu.initrd.enable = true;
     steam-hardware.enable = true;
   };
-  services.ollama.enable = true;
+
+  services.ollama = {
+    enable = true;
+    acceleration = "rocm";
+  };
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;