Stop installing xorg packages for Wayland profiles

[dylanmtaylor]

Wayland profiles no longer pull in xorg-server and xorg-xinit.

Adds an is_wayland property to Profile. Wayland profiles (GNOME, KDE Plasma, Cosmic, hyprland, sway, niri, river, labwc) extend Profile directly instead of XorgProfile. X11 profiles stay on XorgProfile.

[dylanmtaylor]

Ah, I spotted a bug.

	def __init__(
		self,
		name: str = 'Wayland',
		profile_type: ProfileType = ProfileType.Xorg,
	):

Need to fix that.

[dylanmtaylor]

I still need to test this, but it's probably not too far off from correct.

[h8d13]

I believe you will run into one issue is that you will need to hide wayland from menu choice since it can't really be used standalone, should be hidden in /lib/profile/profiles_handler.py if I remember correctly

	def _find_available_profiles(self) -> list[Profile]:
		"""
		Search the profile path for profile definitions
		"""
		profiles_path = Path(__file__).parents[2] / 'default_profiles'
		profiles = []
		for file in profiles_path.glob('**/*.py'):
			# ignore the abstract default_profiles classes
			# and wayland standalone
			if file.name in ('profile.py', 'wayland.py'):
				continue

[dylanmtaylor]

I believe you will run into one issue is that you will need to hide wayland from menu choice since it can't really be used standalone, should be hidden in /lib/profile/profiles_handler.py if I remember correctly

	def _find_available_profiles(self) -> list[Profile]:
		"""
		Search the profile path for profile definitions
		"""
		profiles_path = Path(__file__).parents[2] / 'default_profiles'
		profiles = []
		for file in profiles_path.glob('**/*.py'):
			# ignore the abstract default_profiles classes
			# and wayland standalone
			if file.name in ('profile.py', 'wayland.py'):
				continue

Ah, nice callout. I implemented the code from this comment.

[dylanmtaylor]

We can remove 'xorg-xinit', from awesome since it's in the base class now.

[dylanmtaylor]

Tested working with KDE.

This is good to go in.

[h8d13]

Looks great, and a nice gain in download/install size + unnecessary attack surface

[svartkanin]

@dylanmtaylor instead of using inheritance for this, can we move this to a composition pattern instead as it will make refactoring easier in the future. Also the creating a wayland profile indicates that this is a standalone profile which it isn't.
The profiles should have a property is_wayland or something.

[dylanmtaylor]

@dylanmtaylor instead of using inheritance for this, can we move this to a composition pattern instead as it will make refactoring easier in the future. Also the creating a wayland profile indicates that this is a standalone profile which it isn't.
The profiles should have a property is_wayland or something.

I already have handled it not being reported as a standalone pattern in this change as it currently gets excluded from profile selection but I'll rethink the approach.

[dylanmtaylor]

This block is now necessary for the base Xorg profile (no desktop) to install its own packages:

	@override
	def install(self, install_session: Installer) -> None:
		install_session.add_additional_packages(self.packages)

[dylanmtaylor]

This is tested (again) and still working after the refactor.

[dylanmtaylor]

@svartkanin Is this closer to what you were thinking now?

[svartkanin]

Somewhat.
I would move the

	@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

from the XorgProfile into the Profile class as that's common for all child profiles.

Then we can change the inheritence for all profiles from

class BspwmProfile(XorgProfile):
...
class DeepinProfile(XorgProfile):
...

to

class BspwmProfile(Profile):
...
class DeepinProfile(Profile):
...

The parameter in profile can even be a enum

class DisplayServerType(Enum):
	Xorg = 'Xorg'
	Wayland = 'Wayland'


class Profile:
	def __init__(
		self,
                ...
		display_server: DisplayServerType | None = None,
	) -> None:

and set that in the profiles

class BspwmProfile(Profile):
	def __init__(self) -> None:
		super().__init__(
                        ...
			display_server=DisplayServerType.Xorg,

		)

and then the installation in https://github.com/svartkanin/archinstall/blob/dd0da34ed9b61053b7bb67c106507541f382071c/archinstall/default_profiles/desktop.py?plain=1#L94
should probably install the xorg/wayland things depending on which one is set per profile.

what do you think?

[Torxed]

That looks really clean in my opinion.

[dylanmtaylor]

I like it, I'm working on the change now. We do need to make sure the base xorg profile continues to install on its own.

[dylanmtaylor]

Alright, new updated version is ready for review. I'll do a few installation tests myself in a bit.

[dylanmtaylor]

Just did a few installation tests. This seems to still work, and I like how clean it is implemented now. @Torxed / @svartkanin I think this is ready to merge in