From 08aae1a58164167e667fa80eb8d9aaccc555929f Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Tue, 19 Nov 2024 12:30:03 +0100
Subject: [PATCH] feat: add environment variables for ROCm and libva

Included HSA_OVERRIDE_GFX_VERSION for ROCm acceleration. Added LIBVA_DRIVER_NAME and commented NIXOS_OZONE_WL to environment.sessionVariables settings.
---
 modules/nixos/services/gui/default.nix | 10 ++--------
 systems/x86_64-linux/x1/default.nix    |  9 +++++++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 5390a2a..719a890 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -92,14 +92,8 @@ in
             clr
           ];
         };
-      in [
-        "L+    /opt/rocm   -    -    -     -    ${rocmEnv}"
-      ];
-
-    environment.sessionVariables = {
-      # LIBVA_DRIVER_NAME = "iHD";
-      # NIXOS_OZONE_WL = "1";
-    };
+      in
+      [ "L+    /opt/rocm   -    -    -     -    ${rocmEnv}" ];
 
     metacfg.home.configFile."mpv/mpv.conf".text = ''
       hwdec=auto-safe
diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix
index fef526b..497ed36 100644
--- a/systems/x86_64-linux/x1/default.nix
+++ b/systems/x86_64-linux/x1/default.nix
@@ -71,6 +71,15 @@ with lib.metacfg;
   services.ollama = {
     enable = true;
     acceleration = "rocm";
+    environmentVariables = {
+      HSA_OVERRIDE_GFX_VERSION = "10.1.0";
+    };
+  };
+
+  environment.sessionVariables = {
+    LIBVA_DRIVER_NAME = "iHD";
+    # NIXOS_OZONE_WL = "1";
+    # DRI_PRIME = "pci-0000_24_00_0";
   };
 
   system.stateVersion = "23.11";