Merge pull request #192 from advaithm/kde-hook

Use _post_install for wayland

4 files changed, 12 insertions, 42 deletions

diff --git a/profiles/applications/kde-wayland.py b/profiles/applications/kde-wayland.py
deleted file mode 100644
index 6a9be294..00000000
--- a/profiles/applications/kde-wayland.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import archinstall
-packages = "plasma-meta kde-applications-meta plasma-wayland-session sddm"
-# if the package selection can be reduced go for it
-if "nvidia" in _gfx_driver_packages:
-	packages = packages + " egl-wayland"
-installation.add_additional_packages(packages)
-# We'll support plasma-desktop-wayland (minimal) later
diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
index 87a266b0..fc42223b 100644
--- a/profiles/applications/kde.py
+++ b/profiles/applications/kde.py
@@ -1,2 +1,5 @@
 import archinstall
-installation.add_additional_packages("plasma-meta kde-applications-meta sddm") # We'll support plasma-desktop (minimal) later iirc sddm should be part of plasma-meta
+packages = "plasma-meta kde-applications-meta sddm plasma-wayland-session"
+if "nvidia" in _gfx_driver_packages:
+	packages = packages + " egl-wayland"
+installation.add_additional_packages(packages)
\ No newline at end of file
diff --git a/profiles/kde-wayland.py b/profiles/kde-wayland.py
deleted file mode 100644
index 31226952..00000000
--- a/profiles/kde-wayland.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# A desktop environement using "KDE".
-import archinstall, os
-
-# TODO: Remove hard dependency of bash (due to .bash_profile)
-
-def _prep_function(*args, **kwargs):
-	"""
-	Magic function called by the importing installer
-	before continuing any further. It also avoids executing any
-	other code in this stage. So it's a safe way to ask the user
-	for more input before any other installer steps start.
-	"""
-
-	# KDE requires a functioning Xorg installation.
-	profile = archinstall.Profile(None, 'xorg')
-	with profile.load_instructions(namespace='xorg.py') as imported:
-		if hasattr(imported, '_prep_function'):
-			return imported._prep_function()
-		else:
-			print('Deprecated (??): xorg profile has no _prep_function() anymore')
-
-# Ensures that this code only gets executed if executed
-# through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
-# or through conventional import kde
-if __name__ == 'kde-wayland':
-	# Install dependency profiles
-	installation.install_profile('xorg')
-
-	# Install the application kde from the template under /applications/
-	kde = archinstall.Application(installation, 'kde-wayland')
-	kde.install()
-	print("when you login,  select Plasma (Wayland) for the wayland session")
-	# Enable autostart of KDE for all users
-	installation.enable_service('sddm')
diff --git a/profiles/kde.py b/profiles/kde.py
index 752a08d2..0207ed22 100644
--- a/profiles/kde.py
+++ b/profiles/kde.py
@@ -20,6 +20,14 @@ def _prep_function(*args, **kwargs):
 		else:
 			print('Deprecated (??): xorg profile has no _prep_function() anymore')
 
+def _post_install(*args, **kwargs):
+	if "nvidia" in _gfx_driver_packages:
+		print("Plasma Wayland has known compatibility issues with the proprietary Nvidia driver")
+	choice = input("Would you like plasma-wayland to be the default session [Y/n] ").lower()
+	if choice == "y":
+		installation.arch_chroot("mv /usr/share/xsessions/plasma.desktop /usr/share/xsessions/plasmax11.desktop")
+		installation.arch_chroot("mv /usr/share/wayland-sessions/plasmawayland.desktop /usr/share/wayland-sessions/plasma.desktop")
+	return True
 # Ensures that this code only gets executed if executed
 # through importlib.util.spec_from_file_location("kde", "/somewhere/kde.py")
 # or through conventional import kde