Add WaylandProfile to avoid installing xorg packages for Wayland compositors

Author: dylanmtaylor

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)
 

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)
 

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)
 

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',

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',

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)
 

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)
 

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',

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.Xorg,
+	):
+		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 []

archinstall/default_profiles/xorg.py

@@ -29,4 +29,5 @@ def preview_text(self) -> str:
 	def packages(self) -> list[str]:
 		return [
 			'xorg-server',
+			'xorg-xinit',
 		]