Merge branch 'master' into torxed-v2.2.0

1 files changed, 7 insertions, 30 deletions

diff --git a/profiles/sway.py b/profiles/sway.py
index f1d2c1f1..5633cce2 100644
--- a/profiles/sway.py
+++ b/profiles/sway.py
@@ -1,6 +1,8 @@
-import archinstall, os
+# A desktop environment using "Sway"
 
-# TODO: Remove hard dependency of bash (due to .bash_profile)
+import archinstall
+
+is_top_level_profile = False
 
 def _prep_function(*args, **kwargs):
 	"""
@@ -9,37 +11,12 @@ def _prep_function(*args, **kwargs):
 	other code in this stage. So it's a safe way to ask the user
 	for more input before any other installer steps start.
 	"""
-
-	__builtins__['_gfx_driver_packages'] = archinstall.select_driver()
-
 	return True
 
-def _post_install(*args, **kwargs):
-	choice = input("Would you like to autostart sway on login [Y/n]: ")
-	if choice.lower == "y":
-		with open(f"{installation.mountpoint}/etc/profile", "a") as f:
-			x = """
-			if [ -z $DISPLAY ] && [ "$(tty)" == "/dev/tty1" ]; then
-  				exec sway
-			fi
-			"""
-			f.write(x)
-			f.close()
-	else:
-		installation.log("To start Sway, run the 'sway' command after logging in.")
-
 # 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
+# through importlib.util.spec_from_file_location("sway", "/somewhere/sway.py")
+# or through conventional import sway
 if __name__ == 'sway':
-
-	installation.add_additional_packages(_gfx_driver_packages)
-
-	# Install dependency profiles
-    if _gfx_driver_packages == 'nvidia':
-		# NOTE: This is technically runnable with the --my-next-gpu-wont-be-nvidia option
-		raise archinstall.lib.exceptions.HardwareIncompatibilityError("Sway does not officially support the proprietary Nvidia driver, you may have to use nouveau.")
-
-	# Install the application kde from the template under /applications/
+	# Install the application sway from the template under /applications/
 	sway = archinstall.Application(installation, 'sway')
 	sway.install()