Merging in latest changes from master.

1 files changed, 42 insertions, 0 deletions

diff --git a/profiles/cutefish.py b/profiles/cutefish.py
new file mode 100644
index 00000000..1df2467a
--- /dev/null
+++ b/profiles/cutefish.py
@@ -0,0 +1,42 @@
+# A desktop environment using "Cutefish"
+
+import archinstall
+
+is_top_level_profile = False
+
+__packages__ = [
+	"cutefish",
+	"noto-fonts",
+	"konsole",
+	"sddm"
+]
+
+
+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.
+	"""
+
+	# Cutefish requires a functional 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("cutefish", "/somewhere/cutefish.py")
+# or through conventional import cutefish
+if __name__ == "cutefish":
+	# Install dependency profiles
+	archinstall.storage["installation_session"].install_profile("xorg")
+
+	# Install the Cutefish packages
+	archinstall.storage["installation_session"].add_additional_packages(__packages__)
+
+	archinstall.storage["installation_session"].enable_service("sddm")