From e26a007ad97991a616b51af587d42a7156851a33 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 7 Jun 2021 14:07:38 +0200 Subject: Add Cutefish profile --- profiles/cutefish.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ profiles/desktop.py | 1 + 2 files changed, 52 insertions(+) create mode 100644 profiles/cutefish.py (limited to 'profiles') diff --git a/profiles/cutefish.py b/profiles/cutefish.py new file mode 100644 index 00000000..b30dec27 --- /dev/null +++ b/profiles/cutefish.py @@ -0,0 +1,51 @@ +# A desktop environment using "Cutefish" + +import archinstall + +is_top_level_profile = False + +__packages__ = [ + "cutefish-core", + "cutefish-dock", + "cutefish-filemanager", + "cutefish-icons", + "cutefish-kwin-plugins", + "cutefish-launcher", + "cutefish-qt-plugins", + "cutefish-settings", + "cutefish-statusbar", + "cutefish-wallpapers", + "cutefish-calculator", + "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") diff --git a/profiles/desktop.py b/profiles/desktop.py index 73df9256..75440613 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -43,6 +43,7 @@ def _prep_function(*args, **kwargs): 'mate', 'deepin', 'enlightenment', + 'cutefish' ] desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True) -- cgit v1.2.3-70-g09d2 From 17bf73ee822b8533a6215c7c5e325796300a852c Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 7 Jun 2021 14:42:06 +0200 Subject: Add noto-fonts to package list --- profiles/cutefish.py | 1 + 1 file changed, 1 insertion(+) (limited to 'profiles') diff --git a/profiles/cutefish.py b/profiles/cutefish.py index b30dec27..30b1c4b5 100644 --- a/profiles/cutefish.py +++ b/profiles/cutefish.py @@ -16,6 +16,7 @@ __packages__ = [ "cutefish-statusbar", "cutefish-wallpapers", "cutefish-calculator", + "noto-fonts", "konsole", "sddm" ] -- cgit v1.2.3-70-g09d2 From 3059fa6953481af64b626ea761446682f1c374b6 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Mon, 7 Jun 2021 16:42:38 +0200 Subject: Use group instead of package list --- profiles/cutefish.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'profiles') diff --git a/profiles/cutefish.py b/profiles/cutefish.py index 30b1c4b5..1df2467a 100644 --- a/profiles/cutefish.py +++ b/profiles/cutefish.py @@ -5,17 +5,7 @@ import archinstall is_top_level_profile = False __packages__ = [ - "cutefish-core", - "cutefish-dock", - "cutefish-filemanager", - "cutefish-icons", - "cutefish-kwin-plugins", - "cutefish-launcher", - "cutefish-qt-plugins", - "cutefish-settings", - "cutefish-statusbar", - "cutefish-wallpapers", - "cutefish-calculator", + "cutefish", "noto-fonts", "konsole", "sddm" -- cgit v1.2.3-70-g09d2 From 53c2452098d22bacd3e5dd3bb6984c4494306deb Mon Sep 17 00:00:00 2001 From: JakobDev Date: Wed, 9 Jun 2021 18:04:36 +0200 Subject: Remove cutefish from desktop.py --- profiles/desktop.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'profiles') diff --git a/profiles/desktop.py b/profiles/desktop.py index 75440613..26da7cbd 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -42,8 +42,7 @@ def _prep_function(*args, **kwargs): 'budgie', 'mate', 'deepin', - 'enlightenment', - 'cutefish' + 'enlightenment' ] desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True) -- cgit v1.2.3-70-g09d2 From 26c522969fac3436209cb6b4669b179f1ee13ab5 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 9 Jun 2021 20:53:23 +0200 Subject: Linter hates on us if there's no comma at the end --- profiles/desktop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'profiles') diff --git a/profiles/desktop.py b/profiles/desktop.py index 26da7cbd..73df9256 100644 --- a/profiles/desktop.py +++ b/profiles/desktop.py @@ -42,7 +42,7 @@ def _prep_function(*args, **kwargs): 'budgie', 'mate', 'deepin', - 'enlightenment' + 'enlightenment', ] desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True) -- cgit v1.2.3-70-g09d2