Remove Nvidia proprietary driver option (nvidia-dkms no longer in repos)

Author: dylanmtaylor

archinstall/lib/hardware.py

@@ -44,7 +44,6 @@ class GfxPackage(Enum):
 	LibvaMesaDriver = 'libva-mesa-driver'
 	LibvaNvidiaDriver = 'libva-nvidia-driver'
 	Mesa = 'mesa'
-	NvidiaDkms = 'nvidia-dkms'
 	NvidiaOpenDkms = 'nvidia-open-dkms'
 	VulkanIntel = 'vulkan-intel'
 	VulkanRadeon = 'vulkan-radeon'
@@ -62,12 +61,11 @@ class GfxDriver(Enum):
 	IntelOpenSource = 'Intel (open-source)'
 	NvidiaOpenKernel = 'Nvidia (open kernel module for newer GPUs, Turing+)'
 	NvidiaOpenSource = 'Nvidia (open-source nouveau driver)'
-	NvidiaProprietary = 'Nvidia (proprietary)'
 	VMOpenSource = 'VirtualBox (open-source)'
 
 	def is_nvidia(self) -> bool:
 		match self:
-			case GfxDriver.NvidiaProprietary | GfxDriver.NvidiaOpenSource | GfxDriver.NvidiaOpenKernel:
+			case GfxDriver.NvidiaOpenSource | GfxDriver.NvidiaOpenKernel:
 				return True
 			case _:
 				return False
@@ -126,12 +124,6 @@ def gfx_packages(self) -> list[GfxPackage]:
 					GfxPackage.LibvaMesaDriver,
 					GfxPackage.VulkanNouveau,
 				]
-			case GfxDriver.NvidiaProprietary:
-				packages += [
-					GfxPackage.NvidiaDkms,
-					GfxPackage.Dkms,
-					GfxPackage.LibvaNvidiaDriver,
-				]
 			case GfxDriver.VMOpenSource:
 				packages += [
 					GfxPackage.Mesa,

archinstall/lib/models/profile.py

@@ -39,6 +39,12 @@ def parse_arg(cls, arg: _ProfileConfigurationSerialization) -> Self:
 		greeter = arg.get('greeter', None)
 		gfx_driver = arg.get('gfx_driver', None)
 
+		if gfx_driver == 'Nvidia (proprietary)':
+			raise ValueError(
+				'The Nvidia proprietary driver (nvidia-dkms) has been removed from the Arch repos. '
+				'Please use "Nvidia (open kernel module for newer GPUs, Turing+)" instead.'
+			)
+
 		return cls(
 			profile,
 			GfxDriver(gfx_driver) if gfx_driver else None,

archinstall/lib/profile/profiles_handler.py

@@ -222,7 +222,7 @@ def install_greeter(self, install_session: Installer, greeter: GreeterType) -> N
 	def install_gfx_driver(self, install_session: Installer, driver: GfxDriver) -> None:
 		debug(f'Installing GFX driver: {driver.value}')
 
-		if driver in [GfxDriver.NvidiaOpenKernel, GfxDriver.NvidiaProprietary]:
+		if driver in [GfxDriver.NvidiaOpenKernel]:
 			headers = [f'{kernel}-headers' for kernel in install_session.kernels]
 			# Fixes https://github.com/archlinux/archinstall/issues/585
 			install_session.add_additional_packages(headers)