Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions archinstall/lib/hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@ class GfxPackage(Enum):
Dkms = 'dkms'
IntelMediaDriver = 'intel-media-driver'
LibvaIntelDriver = 'libva-intel-driver'
LibvaMesaDriver = 'libva-mesa-driver'
LibvaNvidiaDriver = 'libva-nvidia-driver'
Mesa = 'mesa'
NvidiaDkms = 'nvidia-dkms'
NvidiaOpenDkms = 'nvidia-open-dkms'
VulkanIntel = 'vulkan-intel'
VulkanRadeon = 'vulkan-radeon'
Expand All @@ -62,12 +60,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
Expand All @@ -91,7 +88,6 @@ def gfx_packages(self) -> list[GfxPackage]:
GfxPackage.Xf86VideoAmdgpu,
GfxPackage.Xf86VideoAti,
GfxPackage.Xf86VideoNouveau,
GfxPackage.LibvaMesaDriver,
GfxPackage.LibvaIntelDriver,
GfxPackage.IntelMediaDriver,
GfxPackage.VulkanRadeon,
Expand All @@ -103,7 +99,6 @@ def gfx_packages(self) -> list[GfxPackage]:
GfxPackage.Mesa,
GfxPackage.Xf86VideoAmdgpu,
GfxPackage.Xf86VideoAti,
GfxPackage.LibvaMesaDriver,
GfxPackage.VulkanRadeon,
]
case GfxDriver.IntelOpenSource:
Expand All @@ -123,15 +118,8 @@ def gfx_packages(self) -> list[GfxPackage]:
packages += [
GfxPackage.Mesa,
GfxPackage.Xf86VideoNouveau,
GfxPackage.LibvaMesaDriver,
GfxPackage.VulkanNouveau,
]
case GfxDriver.NvidiaProprietary:
packages += [
GfxPackage.NvidiaDkms,
GfxPackage.Dkms,
GfxPackage.LibvaNvidiaDriver,
]
case GfxDriver.VMOpenSource:
packages += [
GfxPackage.Mesa,
Expand Down
6 changes: 6 additions & 0 deletions archinstall/lib/models/profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion archinstall/lib/profile/profiles_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading