Rebase bspwm profile on master (#604)

2 files changed, 44 insertions, 0 deletions

diff --git a/profiles/bspwm.py b/profiles/bspwm.py
new file mode 100644
index 00000000..0fb67ad6
--- /dev/null
+++ b/profiles/bspwm.py
@@ -0,0 +1,43 @@
+# A desktop environment using the bspwm window manager.
+
+import archinstall
+
+is_top_level_profile = False
+
+__packages__ = [
+	'bspwm',
+	'sxhkd',
+	'dmenu',
+	'xdo',
+	'rxvt-unicode',
+	'lightdm',
+	'lightdm-gtk-greeter',
+]
+
+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.
+	"""
+
+	# bspwm 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("bspwm", "/somewhere/bspwm.py")
+# or through conventional import bspwm
+if __name__ == 'bspwm':
+	# Install dependency profiles
+	archinstall.storage['installation_session'].install_profile('xorg')
+	# Install bspwm packages
+	archinstall.storage['installation_session'].add_additional_packages(__packages__)
+	# Set up LightDM for login
+	archinstall.storage['installation_session'].enable_service('lightdm')
diff --git a/profiles/desktop.py b/profiles/desktop.py
index da7f97e5..bd3353e8 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -29,6 +29,7 @@ __supported__ = [
 	'xfce4',
 	'lxqt',
 	'i3',
+	'bspwm',
 	'budgie',
 	'mate',
 	'deepin',