nixos: hardware: graphics: add 32bit Intel drivers

modules/nixos/hardware/graphics/default.nix

@@ -35,19 +35,22 @@ in
     (lib.mkIf (cfg.gpuFlavor == "amd") {
       boot.initrd.kernelModules = lib.mkIf cfg.amd.enableKernelModule [ "amdgpu" ];
 
+      hardware.amdgpu = {
+        # Vulkan
+        amdvlk = lib.mkIf cfg.amd.amdvlk {
+          enable = true;
+          support32Bit = {
+            enable = true;
+          };
+        };
+      };
+
       hardware.opengl = {
         extraPackages = with pkgs; [
           # OpenCL
           rocmPackages.clr
           rocmPackages.clr.icd
-        ]
-        ++ lib.optional cfg.amd.amdvlk amdvlk
-        ;
-
-        extraPackages32 = with pkgs; [
-        ]
-        ++ lib.optional cfg.amd.amdvlk driversi686Linux.amdvlk
-        ;
+        ];
       };
     })
 
@@ -69,6 +72,17 @@ in
           intel-vaapi-driver
           libvdpau-va-gl
         ];
+
+        # FIXME: compare with https://github.com/NixOS/nixos-hardware/pull/945/files
+        extraPackages32 = with pkgs.driversi686Linux; [
+          # Open CL
+          intel-compute-runtime
+
+          # VA API
+          intel-media-driver
+          intel-vaapi-driver
+          libvdpau-va-gl
+        ];
       };
     })
   ]);