Merge pull request #167 from m1ten/torxed-v2.2.0

Add Cinnamon (with lightdm) - Torxed v2.2.0

4 files changed, 40 insertions, 2 deletions

diff --git a/profiles/applications/cinnamon.py b/profiles/applications/cinnamon.py
new file mode 100644
index 00000000..af1cbee2
--- /dev/null
+++ b/profiles/applications/cinnamon.py
@@ -0,0 +1,4 @@
+import archinstall
+
+installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
+# We'll create a cinnamon-minimal later, but for now, we'll avoid issues by giving more than we need.
diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
index 74bf5990..6d6f8f7c 100644
--- a/profiles/applications/xfce4.py
+++ b/profiles/applications/xfce4.py
@@ -1,3 +1,4 @@
 import archinstall
 
-installation.add_additional_packages("xfce4 xfce4-goodies lightdm") # We'll create a xfce4-minimal later, but for now, we'll avoid issues by giving more than we need.
+installation.add_additional_packages("xfce4 xfce4-goodies lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings") 
+# We'll create a xfce4-minimal later, but for now, we'll avoid issues by giving more than we need.
diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py
new file mode 100644
index 00000000..e9c5d085
--- /dev/null
+++ b/profiles/cinnamon.py
@@ -0,0 +1,33 @@
+# A desktop environment using "Cinnamon"
+
+import archinstall
+
+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.
+	"""
+
+	# Cinnamon optionally supports xorg, we'll install it since it also
+	# includes graphic driver setups (this might change in the future)
+	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("cinnamon", "/somewhere/cinnamon.py")
+# or through conventional import cinnamon
+if __name__ == 'cinnamon':
+	# Install dependency profiles
+	installation.install_profile('xorg')
+
+	# Install the application cinnamon from the template under /applications/
+	cinnamon = archinstall.Application(installation, 'cinnamon')
+	cinnamon.install()
+
+	installation.enable_service('lightdm') # Light Display Manager
diff --git a/profiles/desktop.py b/profiles/desktop.py
index 331adf59..0c89e543 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -10,7 +10,7 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 
-	supported_desktops = ['gnome', 'kde', 'awesome', 'xfce4']
+	supported_desktops = ['gnome', 'kde', 'awesome', 'xfce4', 'cinnamon']
 	desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ')
 
 	# Temporarly store the selected desktop profile