fix some gpu setting locations

Author: redxtech

hosts/bastion/default.nix

@@ -9,6 +9,11 @@
     fs.btrfs = true;
     dockerDNS = [ "192.168.50.1" ];
     yubiauth.lockOnRemove.enable = true;
+
+    gpu = {
+      enable = true;
+      amd = true;
+    };
   };
 
   desktop = {

modules/nixos/base/gpu.nix

@@ -2,25 +2,28 @@
 
 let
   inherit (lib) mkIf mkEnableOption;
-  cfg = config.base;
+  cfg = config.base.gpu;
 in {
   options.base.gpu = {
     enable = mkEnableOption "GPU support";
 
-    amd = { enable = mkEnableOption "AMD GPU support"; };
+    amd = mkEnableOption "AMD GPU support";
+    nvidia = mkEnableOption "NVIDIA GPU support";
   };
 
-  config = mkIf cfg.gpu.enable {
-    hardware.opengl = mkIf cfg.gpu.amd.enable {
+  config = mkIf cfg.enable {
+    # ensure only one of amd or nvidia is enabled
+    assertions = [{
+      assertion = !(cfg.amd && cfg.nvidia);
+      message = "Only one of AMD or NVIDIA can be enabled.";
+    }];
+
+    hardware.opengl = mkIf cfg.amd {
       enable = true;
-      extraPackages = with stable; [
+      extraPackages = with pkgs; [
         # ROCm OpenCL ICD
         rocmPackages.clr.icd
-        ocl-icd
-
-        # ROCm
         rocm-opencl-icd
-        rocm-runtime-ext
 
         # AMDVLK
         amdvlk

modules/nixos/desktop/ai.nix

@@ -17,18 +17,9 @@ in {
 
     web-ui = mkEnableOption "Enable the web UI for Ollama.";
     lmstudio = mkEnabledOption "Enable LM Studio.";
-
-    amd = mkEnableOption "Enable AMD ROCM support.";
-    nvidia = mkEnableOption "Enable NVIDIA CUDA support.";
   };
 
   config = mkIf (cfg.enable) {
-    # ensure only one of amd or nvidia is enabled
-    assertions = [{
-      assertion = !(cfg.amd && cfg.nvidia);
-      message = "Only one of AMD or NVIDIA can be enabled.";
-    }];
-
     services = {
       ollama = {
         enable = true;
@@ -42,8 +33,12 @@ in {
             in (lib.concatStringsSep "," origins);
         };
 
-        acceleration =
-          if cfg.amd then "rocm" else if cfg.nvidia then "cuda" else null;
+        acceleration = if config.base.gpu.amd then
+          "rocm"
+        else if config.base.gpu.nvidia then
+          "cuda"
+        else
+          null;
       };
 
       nextjs-ollama-llm-ui = mkIf cfg.web-ui {