fix: HW changes / X11 #4057 #3899

archinstall/default_profiles/custom.py

@@ -203,7 +203,6 @@
 # 			ProfileType.CustomType,
 # 			packages=packages,
 # 			services=services,
-# 			support_gfx_driver=True
 # 		)
 #
 # 		self.custom_enabled = enabled

archinstall/default_profiles/desktops/cosmic.py

@@ -1,6 +1,6 @@
 from typing import override
 
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
 
@@ -20,3 +20,7 @@ def packages(self) -> list[str]:
 	@override
 	def default_greeter_type(self) -> GreeterType:
 		return GreeterType.CosmicSession
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/desktops/gnome.py

@@ -1,6 +1,6 @@
 from typing import override
 
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
 
@@ -20,3 +20,7 @@ def packages(self) -> list[str]:
 	@override
 	def default_greeter_type(self) -> GreeterType:
 		return GreeterType.Gdm
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/desktops/hyprland.py

@@ -1,7 +1,7 @@
 from typing import override
 
 from archinstall.default_profiles.desktops import SeatAccess
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.curses_menu import SelectMenu
@@ -72,3 +72,7 @@ def _ask_seat_access(self) -> None:
 	def do_on_select(self) -> None:
 		self._ask_seat_access()
 		return None
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/desktops/labwc.py

@@ -1,7 +1,7 @@
 from typing import override
 
 from archinstall.default_profiles.desktops import SeatAccess
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.curses_menu import SelectMenu
@@ -69,3 +69,7 @@ def _ask_seat_access(self) -> None:
 	def do_on_select(self) -> None:
 		self._ask_seat_access()
 		return None
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/desktops/niri.py

@@ -1,7 +1,7 @@
 from typing import override
 
 from archinstall.default_profiles.desktops import SeatAccess
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.curses_menu import SelectMenu
@@ -77,3 +77,7 @@ def _ask_seat_access(self) -> None:
 	def do_on_select(self) -> None:
 		self._ask_seat_access()
 		return None
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/desktops/plasma.py

@@ -1,6 +1,6 @@
 from typing import override
 
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
 
@@ -24,3 +24,7 @@ def packages(self) -> list[str]:
 	@override
 	def default_greeter_type(self) -> GreeterType:
 		return GreeterType.Sddm
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/desktops/river.py

@@ -1,6 +1,6 @@
 from typing import override
 
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 
 
@@ -21,3 +21,7 @@ def packages(self) -> list[str]:
 	@override
 	def default_greeter_type(self) -> GreeterType:
 		return GreeterType.Lightdm
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/desktops/sway.py

@@ -1,7 +1,7 @@
 from typing import override
 
 from archinstall.default_profiles.desktops import SeatAccess
-from archinstall.default_profiles.profile import GreeterType, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, GreeterType, ProfileType
 from archinstall.default_profiles.xorg import XorgProfile
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.curses_menu import SelectMenu
@@ -79,3 +79,7 @@ def _ask_seat_access(self) -> None:
 	def do_on_select(self) -> None:
 		self._ask_seat_access()
 		return None
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.Wayland}

archinstall/default_profiles/profile.py

@@ -26,6 +26,11 @@ class ProfileType(Enum):
 	Application = 'Application'
 
 
+class DisplayServer(Enum):
+	X11 = 'x11'
+	Wayland = 'wayland'
+
+
 class GreeterType(Enum):
 	Lightdm = 'lightdm-gtk-greeter'
 	LightdmSlick = 'lightdm-slick-greeter'
@@ -164,17 +169,23 @@ def is_tailored(self) -> bool:
 	def is_custom_type_profile(self) -> bool:
 		return self.profile_type == ProfileType.CustomType
 
-	def is_graphic_driver_supported(self) -> bool:
-		if not self.current_selection:
-			return self._support_gfx_driver
-		else:
-			if any([p._support_gfx_driver for p in self.current_selection]):
-				return True
-			return False
-
 	def is_greeter_supported(self) -> bool:
 		return self._support_greeter
 
+	def display_servers(self) -> set[DisplayServer]:
+		"""
+		Returns the set of display servers required by this profile.
+		By default, returns an empty set (no specific requirements).
+		Profiles should override this to specify their requirements.
+		"""
+		if self.current_selection:
+			# Aggregate requirements from sub-profiles
+			servers = set()
+			for profile in self.current_selection:
+				servers.update(profile.display_servers())
+			return servers
+		return set()
+
 	def preview_text(self) -> str:
 		"""
 		Override this method to provide a preview text for the profile

archinstall/default_profiles/xorg.py

@@ -1,6 +1,6 @@
 from typing import override
 
-from archinstall.default_profiles.profile import Profile, ProfileType
+from archinstall.default_profiles.profile import DisplayServer, Profile, ProfileType
 from archinstall.lib.translationhandler import tr
 
 
@@ -14,7 +14,6 @@ def __init__(
 		super().__init__(
 			name,
 			profile_type,
-			support_gfx_driver=True,
 			advanced=advanced,
 		)
 
@@ -32,3 +31,7 @@ def packages(self) -> list[str]:
 		return [
 			'xorg-server',
 		]
+
+	@override
+	def display_servers(self) -> set[DisplayServer]:
+		return {DisplayServer.X11}

archinstall/lib/hardware.py

@@ -2,13 +2,17 @@
 from enum import Enum
 from functools import cached_property
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from .exceptions import SysCallError
 from .general import SysCommand
 from .networking import enrich_iface_types, list_interfaces
 from .output import debug
 from .translationhandler import tr
 
+if TYPE_CHECKING:
+	from archinstall.default_profiles.profile import DisplayServer
+
 
 class CpuVendor(Enum):
 	AuthenticAMD = 'amd'
@@ -48,6 +52,7 @@ class GfxPackage(Enum):
 	VulkanIntel = 'vulkan-intel'
 	VulkanRadeon = 'vulkan-radeon'
 	VulkanNouveau = 'vulkan-nouveau'
+	VulkanIcdLoader = 'vulkan-icd-loader'
 	Xf86VideoAmdgpu = 'xf86-video-amdgpu'
 	Xf86VideoAti = 'xf86-video-ati'
 	Xf86VideoNouveau = 'xf86-video-nouveau'
@@ -71,17 +76,30 @@ def is_nvidia(self) -> bool:
 			case _:
 				return False
 
-	def packages_text(self) -> str:
-		pkg_names = [p.value for p in self.gfx_packages()]
+	def packages_text(self, servers: set['DisplayServer'] | None = None) -> str:
+		pkg_names = [p.value for p in self.gfx_packages(servers)]
 		text = tr('Installed packages') + ':\n'
 
 		for p in sorted(pkg_names):
 			text += f'\t- {p}\n'
 
 		return text
 
-	def gfx_packages(self) -> list[GfxPackage]:
-		packages = [GfxPackage.XorgServer, GfxPackage.XorgXinit]
+	def gfx_packages(self, servers: set['DisplayServer'] | None = None) -> list[GfxPackage]:
+		from archinstall.default_profiles.profile import DisplayServer
+
+		# empty list
+		packages = []
+
+		# Only add X11 packages if required by said profile
+		if servers is None:
+			# Default behavior when no profile is passed: include X11 for bw-compat
+			packages = [GfxPackage.XorgServer, GfxPackage.XorgXinit]
+		elif servers:
+			# Profile provided display server requirements - respect them
+			if DisplayServer.X11 in servers:
+				packages = [GfxPackage.XorgServer, GfxPackage.XorgXinit]
+		# else: servers is empty set handled by profile itself
 
 		match self:
 			case GfxDriver.AllOpenSource:
@@ -108,7 +126,7 @@ def gfx_packages(self) -> list[GfxPackage]:
 			case GfxDriver.IntelOpenSource:
 				packages += [
 					GfxPackage.Mesa,
-					GfxPackage.LibvaIntelDriver,
+					# GfxPackage.LibvaIntelDriver, #ISSUE#3005 (legacy)
 					GfxPackage.IntelMediaDriver,
 					GfxPackage.VulkanIntel,
 				]
@@ -134,6 +152,8 @@ def gfx_packages(self) -> list[GfxPackage]:
 			case GfxDriver.VMOpenSource:
 				packages += [
 					GfxPackage.Mesa,
+					GfxPackage.VulkanIcdLoader,
+					GfxPackage.LibvaMesaDriver,
 				]
 
 		return packages

archinstall/lib/interactions/system_conf.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from archinstall.lib.models.application import ZramAlgorithm, ZramConfiguration
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.curses_menu import SelectMenu
@@ -9,6 +11,9 @@
 
 from ..hardware import GfxDriver, SysInfo
 
+if TYPE_CHECKING:
+	from archinstall.default_profiles.profile import Profile
+
 
 def select_kernel(preset: list[str] = []) -> list[str]:
 	"""
@@ -45,7 +50,7 @@ def select_kernel(preset: list[str] = []) -> list[str]:
 			return result.get_values()
 
 
-def select_driver(options: list[GfxDriver] = [], preset: GfxDriver | None = None) -> GfxDriver | None:
+def select_driver(options: list[GfxDriver] = [], preset: GfxDriver | None = None, profile: 'Profile | None' = None) -> GfxDriver | None:
 	"""
 	Somewhat convoluted function, whose job is simple.
 	Select a graphics driver from a pre-defined set of popular options.
@@ -56,7 +61,9 @@ def select_driver(options: list[GfxDriver] = [], preset: GfxDriver | None = None
 	if not options:
 		options = [driver for driver in GfxDriver]
 
-	items = [MenuItem(o.value, value=o, preview_action=lambda x: x.value.packages_text()) for o in options]
+	# Get display server requirements from profile if available
+	servers = profile.display_servers() if profile else None
+	items = [MenuItem(o.value, value=o, preview_action=lambda x: x.value.packages_text(servers)) for o in options]
 	group = MenuItemGroup(items, sort_items=True)
 	group.set_default_by_value(GfxDriver.AllOpenSource)