Merge #630 #649 #650 #652 #654 #656 #657

630: starfive visionfive2: update kernel to 6.4.0 r=Mic92 a=NickCao



649: macbook-air-6: remove mba6x_bl kernel module r=Mic92 a=DanielSiepmann



650: apple/t2: init r=Mic92 a=networkException



652: build(deps): bump cachix/install-nix-action from 21 to 22 r=Mic92 a=dependabot[bot]



654: fixing iptsd not able to find DEVICE r=Mic92 a=buttergrillcorn



656: treewide: avoid alias usage for intel-vaapi-driver based on nixos version r=Mic92 a=lilyinstarlight



657: Added more blocked Nvidia kernel modules to fix the dGPU not being disabled r=Mic92 a=spacebanana420



Co-authored-by: Nick Cao <nickcao@nichi.co>
Co-authored-by: Daniel Siepmann <coding@daniel-siepmann.de>
Co-authored-by: kekrby <kekrby@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: buttergrillcorn <126628446+buttergrillcorn@users.noreply.github.com>
Co-authored-by: Lily Foster <lily@lily.flowers>
Co-authored-by: Space Banana <tomasbessa@protonmail.com>

common/gpu/intel/default.nix

@@ -8,7 +8,7 @@
   };
 
   hardware.opengl.extraPackages = with pkgs; [
-    vaapiIntel
+    (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
     libvdpau-va-gl
     intel-media-driver
   ];

common/gpu/nvidia/disable.nix

@@ -22,5 +22,5 @@
     # Remove NVIDIA VGA/3D controller devices
     ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
   '';
-  boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" ];
-}
+  boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ];
+}