fixes for multi gpu

hosts/bunk/modules.nix

@@ -20,7 +20,7 @@
       };
       graphics = {
         enable = true;
-        vendor = "amd";
+        vendors = ["amd"];
       };
       logitech = {
         enable = false;

hosts/kima/modules.nix

@@ -21,7 +21,7 @@
       };
       graphics = {
         enable = true;
-        vendor = "amd";
+        vendors = ["amd"];
       };
       logitech = {
         enable = true;

hosts/sobotka/modules.nix

@@ -21,7 +21,7 @@
       };
       graphics = {
         enable = true;
-        vendor = "intel";
+        vendors = ["intel" "amd"];
       };
       logitech = {
         enable = false;

hosts/toothpc/modules.nix

@@ -20,7 +20,7 @@
       };
       graphics = {
         enable = true;
-        vendor = "nvidia";
+        vendors = ["nvidia"];
         nvidia = {
           package = "beta";
           open = {

modules/nixos/hardware/graphics/default.nix

@@ -1,28 +1,26 @@
 {
-  pkgs,
   config,
   lib,
+  pkgs,
   ...
 }: let
-  inherit (lib) mkEnableOption mkOption types mkIf mkMerge;
+  inherit (lib) mkEnableOption mkOption types mkIf mkMerge flatten concatMap;
 
   cfg = config.nixos.hardware.graphics;
-  vendor = cfg.vendor;
 
-  # Common packages used across all vendors
   commonPackages = with pkgs; [
     libva
     vaapiVdpau
     libvdpau-va-gl
     libGL
   ];
+
   commonPackages32 = with pkgs.pkgsi686Linux; [
     libva
     vaapiVdpau
     libvdpau-va-gl
   ];
 
-  # Mesa Vulkan packages (used by AMD & Intel only)
   mesaVulkanPackages = with pkgs; [
     vulkan-loader
     vulkan-validation-layers
@@ -30,7 +28,6 @@
     vulkan-utility-libraries
   ];
 
-  # Extra desktop utilities
   tools = with pkgs; [
     vulkan-tools
     wayland
@@ -48,18 +45,21 @@
     export ELECTRON_OZONE_PLATFORM_HINT=auto
     exec "$@"
   '';
+
+  hasVendor = vendor: builtins.elem vendor cfg.vendors;
 in {
   options.nixos.hardware.graphics = {
     enable = mkEnableOption "Enable general graphics support";
 
-    vendor = mkOption {
+    vendors = mkOption {
-      type = types.enum ["amd" "intel" "nvidia"];
+      type = types.listOf (types.enum ["amd" "intel" "nvidia"]);
-      default = "amd";
+      default = ["amd"];
-      description = "GPU vendor to configure support for.";
+      description = "List of GPU vendors to configure support for.";
     };
 
     nvidia = {
       open.enable = mkEnableOption "Enable NVidia open drivers";
+
       package = mkOption {
         type = types.enum ["stable" "beta" "production" "latest"];
         default = "stable";
@@ -68,70 +68,79 @@ in {
     };
   };
 
-  config = mkIf cfg.enable (
+  config = mkIf cfg.enable (mkMerge [
-    mkMerge [
+    {
-      {
+      hardware.graphics = {
-        hardware.graphics = {
+        enable = true;
-          enable = true;
+        enable32Bit = true;
-          enable32Bit = true;
+        extraPackages = flatten (concatMap (
-        };
+            vendor:
-      }
+              if vendor == "amd"
+              then commonPackages ++ mesaVulkanPackages
+              else if vendor == "intel"
+              then
+                commonPackages
+                ++ mesaVulkanPackages
+                ++ (with pkgs; [
+                  vpl-gpu-rt
+                  intel-media-driver
+                  intel-compute-runtime
+                ])
+              else if vendor == "nvidia"
+              then
+                commonPackages
+                ++ (with pkgs; [
+                  nvidiaOffloadScript
+                  intel-media-driver
+                  nvidia-vaapi-driver
+                  vulkan-tools
+                ])
+              else []
+          )
+          cfg.vendors);
 
-      # AMD-specific configuration
+        extraPackages32 = flatten (concatMap (_: commonPackages32) cfg.vendors);
-      (mkIf (vendor == "amd") {
+      };
-        hardware.amdgpu.overdrive.enable = true;
-        hardware.graphics.extraPackages = commonPackages ++ mesaVulkanPackages;
-        hardware.graphics.extraPackages32 = commonPackages32;
-        environment.systemPackages = tools;
-      })
 
-      # Intel-specific configuration
+      environment.systemPackages = flatten (concatMap (
-      (mkIf (vendor == "intel") {
+          vendor:
-        hardware.graphics.extraPackages =
+            if vendor == "amd"
-          commonPackages
+            then
-          ++ mesaVulkanPackages
+              tools
-          ++ (with pkgs; [
+              ++ (with pkgs; [
-            vpl-gpu-rt
+                # rocmPackages.rpp
-            intel-media-driver
+                # rocmPackages.clr
-            intel-compute-runtime
+              ])
-          ]);
+            else if vendor == "intel"
-        hardware.graphics.extraPackages32 = commonPackages32;
+            then tools
-        environment.systemPackages = tools;
+            else if vendor == "nvidia"
-      })
+            then with pkgs; [egl-wayland libGL]
+            else []
+        )
+        cfg.vendors);
+    }
 
-      # Nvidia-specific configuration
+    (mkIf (hasVendor "amd") {
-      (mkIf (vendor == "nvidia") {
+      hardware.amdgpu.overdrive.enable = true;
-        hardware.graphics.extraPackages =
+    })
-          commonPackages
-          ++ (with pkgs; [
-            nvidiaOffloadScript
-            intel-media-driver
-            nvidia-vaapi-driver
-            vulkan-tools
-          ]);
-        hardware.graphics.extraPackages32 = commonPackages32;
-        environment.systemPackages = with pkgs; [
-          egl-wayland
-          libGL
-        ];
 
-        hardware.nvidia = {
+    (mkIf (hasVendor "nvidia") {
-          package =
+      hardware.nvidia = {
-            if cfg.nvidia.package == "beta"
+        package =
-            then config.boot.kernelPackages.nvidiaPackages.beta
+          if cfg.nvidia.package == "beta"
-            else if cfg.nvidia.package == "latest"
+          then config.boot.kernelPackages.nvidiaPackages.beta
-            then config.boot.kernelPackages.nvidiaPackages.latest
+          else if cfg.nvidia.package == "latest"
-            else if cfg.nvidia.package == "production"
+          then config.boot.kernelPackages.nvidiaPackages.latest
-            then config.boot.kernelPackages.nvidiaPackages.production
+          else if cfg.nvidia.package == "production"
-            else config.boot.kernelPackages.nvidiaPackages.stable;
+          then config.boot.kernelPackages.nvidiaPackages.production
+          else config.boot.kernelPackages.nvidiaPackages.stable;
 
-          modesetting.enable = true;
+        modesetting.enable = true;
-          powerManagement.enable = false;
+        powerManagement.enable = false;
-          powerManagement.finegrained = false;
+        powerManagement.finegrained = false;
-          open = cfg.nvidia.open.enable;
+        open = cfg.nvidia.open.enable;
-          nvidiaSettings = true;
+        nvidiaSettings = true;
-        };
+      };
-      })
+    })
-    ]
+  ]);
-  );
 }

modules/nixos/programs/pkgs/default.nix

@@ -63,6 +63,8 @@ in {
           cloudflared
           libargon2
           openssl
+          xmrig
+          ocl-icd
         ]
 
         (mkIf cfg.common.enable [