Merge branch 'torxed-v2.2.0' into torxed-v2.2.0

1 files changed, 16 insertions, 6 deletions

diff --git a/profiles/desktop.py b/profiles/desktop.py
index 0c89e543..dce2e18b 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -2,6 +2,12 @@
 
 import archinstall, os
 
+is_top_level_profile = True
+
+# New way of defining packages for a profile, which is iterable and can be used out side
+# of the profile to get a list of "what packages will be installed".
+__packages__ = ['nano', 'vim', 'openssh', 'htop', 'wget', 'iwd', 'wireless_tools', 'wpa_supplicant', 'smartmontools', 'xdg-utils']
+
 def _prep_function(*args, **kwargs):
 	"""
 	Magic function called by the importing installer
@@ -10,11 +16,11 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 
-	supported_desktops = ['gnome', 'kde', 'awesome', 'xfce4', 'cinnamon']
+	supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie', 'mate', 'deepin']
 	desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ')
-
-	# Temporarly store the selected desktop profile
-	# in a session-safe location, since this module will get re-loaded
+	
+	# Temporarily store the selected desktop profile
+	# in a session-safe location, since this module will get reloaded
 	# the next time it gets executed.
 	archinstall.storage['_desktop_profile'] = desktop
 
@@ -29,7 +35,7 @@ def _prep_function(*args, **kwargs):
 if __name__ == 'desktop':
 	"""
 	This "profile" is a meta-profile.
-	There are no specific desktop-steps, it simply routes
+	There are no desktop-specific steps, it simply routes
 	the installer to whichever desktop environment/window manager was chosen.
 
 	Maybe in the future, a network manager or similar things *could* be added here.
@@ -37,9 +43,13 @@ if __name__ == 'desktop':
 	it trying to be a turn-key desktop distribution.
 
 	There are plenty of desktop-turn-key-solutions based on Arch Linux,
-	this is therefor just a helper to get started
+	this is therefore just a helper to get started
 	"""
+	
+	# Install common packages for all desktop environments
+	installation.add_additional_packages(__packages__)
 
 	# TODO: Remove magic variable 'installation' and place it
 	#       in archinstall.storage or archinstall.session/archinstall.installation
 	installation.install_profile(archinstall.storage['_desktop_profile'])
+