From f91c0137d5f9a5f01229f21e62e81e52e41635ce Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:14:18 -0400 Subject: Remove refs to application profiles that were removed --- profiles/cinnamon.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'profiles/cinnamon.py') diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py index 91a59811..a8b89031 100644 --- a/profiles/cinnamon.py +++ b/profiles/cinnamon.py @@ -27,8 +27,7 @@ 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() + # Install the Cinnamon packages + installation.add_additional_packages(__packages__) installation.enable_service('lightdm') # Light Display Manager -- cgit v1.2.3-70-g09d2 From 6013e06fb134eb6d07764aea778399baccd49d21 Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Wed, 28 Apr 2021 11:20:00 -0400 Subject: Add packages to top of each desktop profile --- profiles/cinnamon.py | 2 ++ profiles/deepin.py | 1 + profiles/gnome.py | 3 +++ profiles/kde.py | 2 ++ profiles/lxqt.py | 2 ++ profiles/mate.py | 2 ++ profiles/sway.py | 2 ++ profiles/xfce4.py | 2 ++ 8 files changed, 16 insertions(+) (limited to 'profiles/cinnamon.py') diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py index a8b89031..4ca9cfed 100644 --- a/profiles/cinnamon.py +++ b/profiles/cinnamon.py @@ -4,6 +4,8 @@ import archinstall is_top_level_profile = False +__packages__ = ["cinnamon", "system-config-printer", "gnome-keyring", "gnome-terminal", "blueberry", "metacity", "lightdm", "lightdm-gtk-greeter"] + def _prep_function(*args, **kwargs): """ Magic function called by the importing installer diff --git a/profiles/deepin.py b/profiles/deepin.py index f476f7e3..ce59a699 100644 --- a/profiles/deepin.py +++ b/profiles/deepin.py @@ -4,6 +4,7 @@ import archinstall, os is_top_level_profile = False +__packages__ = ["deepin", "deepin-terminal", "deepin-editor"] def _prep_function(*args, **kwargs): """ diff --git a/profiles/gnome.py b/profiles/gnome.py index cc80a606..a480d713 100644 --- a/profiles/gnome.py +++ b/profiles/gnome.py @@ -4,6 +4,9 @@ import archinstall is_top_level_profile = False +# Note: GDM should be part of the gnome group, but adding it here for clarity +__packages__ = ["gnome". "gnome-tweaks", "gdm"] + def _prep_function(*args, **kwargs): """ Magic function called by the importing installer diff --git a/profiles/kde.py b/profiles/kde.py index 6654dfa7..28460cbc 100644 --- a/profiles/kde.py +++ b/profiles/kde.py @@ -4,6 +4,8 @@ import archinstall, os is_top_level_profile = False +__packages__ = ["plasma-meta", "konsole", "kate", "dolphin", "sddm", "plasma-wayland-session"] + # TODO: Remove hard dependency of bash (due to .bash_profile) def _prep_function(*args, **kwargs): diff --git a/profiles/lxqt.py b/profiles/lxqt.py index e1ac8ab7..d0727a90 100644 --- a/profiles/lxqt.py +++ b/profiles/lxqt.py @@ -5,6 +5,8 @@ import archinstall is_top_level_profile = False +__packages__ = ["lxqt", "breeze-icons", "oxygen-icons", "xdg-utils", "ttf-freefont", "leafpad", "slock", "sddm"] + def _prep_function(*args, **kwargs): """ Magic function called by the importing installer diff --git a/profiles/mate.py b/profiles/mate.py index 3b48d0ab..2cfe7305 100644 --- a/profiles/mate.py +++ b/profiles/mate.py @@ -4,6 +4,8 @@ import archinstall is_top_level_profile = False +__packages__ = ["mate", "mate-extra", "lightdm", "lightdm-gtk-greeter"] + def _prep_function(*args, **kwargs): """ Magic function called by the importing installer diff --git a/profiles/sway.py b/profiles/sway.py index 84ea049b..db94ae2c 100644 --- a/profiles/sway.py +++ b/profiles/sway.py @@ -4,6 +4,8 @@ import archinstall is_top_level_profile = False +__packages__ = ["sway", "swaylock", "swayidle", "waybar", "dmenu", "light", "grim", "slurp", "pavucontrol", "alacritty"] + def _prep_function(*args, **kwargs): """ Magic function called by the importing installer diff --git a/profiles/xfce4.py b/profiles/xfce4.py index ffe4a3c0..8102919b 100644 --- a/profiles/xfce4.py +++ b/profiles/xfce4.py @@ -5,6 +5,8 @@ import archinstall is_top_level_profile = False +__packages__ = ["xfce4", "xfce4-goodies", "lightdm", "lightdm-gtk-greeter"] + def _prep_function(*args, **kwargs): """ Magic function called by the importing installer -- cgit v1.2.3-70-g09d2