Add WaylandProfile to avoid installing xorg packages for Wayland compositors

dylanmtaylor · dylanmtaylor · commit 27fbd3639265 · 2026-03-31T19:29:47.000-04:00
diff --git a/archinstall/default_profiles/desktops/awesome.py b/archinstall/default_profiles/desktops/awesome.py
@@ -19,7 +19,6 @@ def packages(self) -> list[str]:
 		return super().packages + [
 			'awesome',
 			'alacritty',
-			'xorg-xinit',
 			'xorg-xrandr',
 			'xterm',
 			'feh',
diff --git a/archinstall/default_profiles/desktops/cosmic.py b/archinstall/default_profiles/desktops/cosmic.py
@@ -1,10 +1,10 @@
 from typing import override
 
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 
 
-class CosmicProfile(XorgProfile):
+class CosmicProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__('Cosmic', ProfileType.DesktopEnv)
 
diff --git a/archinstall/default_profiles/desktops/gnome.py b/archinstall/default_profiles/desktops/gnome.py
@@ -1,10 +1,10 @@
 from typing import override
 
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 
 
-class GnomeProfile(XorgProfile):
+class GnomeProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__('GNOME', ProfileType.DesktopEnv)
 
diff --git a/archinstall/default_profiles/desktops/hyprland.py b/archinstall/default_profiles/desktops/hyprland.py
@@ -2,14 +2,14 @@
 
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
 
 
-class HyprlandProfile(XorgProfile):
+class HyprlandProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__('Hyprland', ProfileType.DesktopEnv)
 
diff --git a/archinstall/default_profiles/desktops/labwc.py b/archinstall/default_profiles/desktops/labwc.py
@@ -2,14 +2,14 @@
 
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
 
 
-class LabwcProfile(XorgProfile):
+class LabwcProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__(
 			'Labwc',
diff --git a/archinstall/default_profiles/desktops/niri.py b/archinstall/default_profiles/desktops/niri.py
@@ -2,14 +2,14 @@
 
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
 
 
-class NiriProfile(XorgProfile):
+class NiriProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__(
 			'Niri',
diff --git a/archinstall/default_profiles/desktops/plasma.py b/archinstall/default_profiles/desktops/plasma.py
@@ -1,10 +1,10 @@
 from typing import override
 
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 
 
-class PlasmaProfile(XorgProfile):
+class PlasmaProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__('KDE Plasma', ProfileType.DesktopEnv)
 
diff --git a/archinstall/default_profiles/desktops/river.py b/archinstall/default_profiles/desktops/river.py
@@ -1,10 +1,10 @@
 from typing import override
 
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 
 
-class RiverProfile(XorgProfile):
+class RiverProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__('River', ProfileType.WindowMgr)
 
diff --git a/archinstall/default_profiles/desktops/sway.py b/archinstall/default_profiles/desktops/sway.py
@@ -2,14 +2,14 @@
 
 from archinstall.default_profiles.desktops import SeatAccess
 from archinstall.default_profiles.profile import GreeterType, ProfileType
-from archinstall.default_profiles.xorg import XorgProfile
+from archinstall.default_profiles.wayland import WaylandProfile
 from archinstall.lib.menu.helpers import Selection
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
 
 
-class SwayProfile(XorgProfile):
+class SwayProfile(WaylandProfile):
 	def __init__(self) -> None:
 		super().__init__(
 			'Sway',
diff --git a/archinstall/default_profiles/profile.py b/archinstall/default_profiles/profile.py
@@ -15,6 +15,7 @@ class ProfileType(Enum):
 	Server = 'Server'
 	Desktop = 'Desktop'
 	Xorg = 'Xorg'
+	Wayland = 'Wayland'
 	Minimal = 'Minimal'
 	Custom = 'Custom'
 	# detailed selection default_profiles
@@ -140,7 +141,7 @@ def reset(self) -> None:
 		self.current_selection = []
 
 	def is_top_level_profile(self) -> bool:
-		top_levels = [ProfileType.Desktop, ProfileType.Server, ProfileType.Xorg, ProfileType.Minimal, ProfileType.Custom]
+		top_levels = [ProfileType.Desktop, ProfileType.Server, ProfileType.Xorg, ProfileType.Wayland, ProfileType.Minimal, ProfileType.Custom]
 		return self.profile_type in top_levels
 
 	def is_desktop_profile(self) -> bool:
diff --git a/archinstall/default_profiles/wayland.py b/archinstall/default_profiles/wayland.py
@@ -0,0 +1,30 @@
+from typing import override
+
+from archinstall.default_profiles.profile import Profile, ProfileType
+from archinstall.lib.translationhandler import tr
+
+
+class WaylandProfile(Profile):
+	def __init__(
+		self,
+		name: str = 'Wayland',
+		profile_type: ProfileType = ProfileType.Wayland,
+	):
+		super().__init__(
+			name,
+			profile_type,
+			support_gfx_driver=True,
+		)
+
+	@override
+	def preview_text(self) -> str:
+		text = tr('Environment type: {}').format(self.profile_type.value)
+		if packages := self.packages_text():
+			text += f'\n{packages}'
+
+		return text
+
+	@property
+	@override
+	def packages(self) -> list[str]:
+		return []
diff --git a/archinstall/default_profiles/xorg.py b/archinstall/default_profiles/xorg.py
@@ -29,4 +29,5 @@ def preview_text(self) -> str:
 	def packages(self) -> list[str]:
 		return [
 			'xorg-server',
+			'xorg-xinit',
 		]
diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
@@ -50,8 +50,6 @@ class GfxPackage(Enum):
 	Xf86VideoAmdgpu = 'xf86-video-amdgpu'
 	Xf86VideoAti = 'xf86-video-ati'
 	Xf86VideoNouveau = 'xf86-video-nouveau'
-	XorgServer = 'xorg-server'
-	XorgXinit = 'xorg-xinit'
 
 
 class GfxDriver(Enum):
@@ -79,7 +77,7 @@ def packages_text(self) -> str:
 		return text
 
 	def gfx_packages(self) -> list[GfxPackage]:
-		packages = [GfxPackage.XorgServer, GfxPackage.XorgXinit]
+		packages: list[GfxPackage] = []
 
 		match self:
 			case GfxDriver.AllOpenSource:
diff --git a/archinstall/lib/profile/profiles_handler.py b/archinstall/lib/profile/profiles_handler.py
@@ -340,8 +340,8 @@ def _find_available_profiles(self) -> list[Profile]:
 		profiles_path = Path(__file__).parents[2] / 'default_profiles'
 		profiles = []
 		for file in profiles_path.glob('**/*.py'):
-			# ignore the abstract default_profiles class
-			if 'profile.py' in file.name:
+			# ignore the abstract base classes
+			if file.name in ('profile.py', 'wayland.py'):
 				continue
 			profiles += self._process_profile_file(file)
 
