RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #378 from dylanmtaylor/packages 

Desktop Environment Cleanup and Switch to Packages Definitions
This commit is contained in:
Anton Hvornum 2021-04-29 08:23:29 +00:00 committed by GitHub
parent 2d02e806f2 455dd24614
commit 055b6dd905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 39 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
profiles/applications/alacritty.py
View File

@ -1,3 +0,0 @@
import archinstall
installation.add_additional_packages("alacritty")

4
profiles/applications/budgie.py
View File

@ -1,4 +0,0 @@
import archinstall
# "It is recommended also to install the gnome group, which contains applications required for the standard GNOME experience." - Arch Wiki
installation.add_additional_packages("budgie-desktop lightdm lightdm-gtk-greeter gnome")

3
profiles/applications/cinnamon.py
View File

@ -1,3 +0,0 @@
import archinstall
installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter")

5
profiles/applications/deepin.py
View File

@ -1,5 +0,0 @@
import archinstall
packages = "deepin deepin-terminal deepin-editor"
installation.add_additional_packages(packages)

4
profiles/applications/gnome.py
View File

@ -1,4 +0,0 @@
import archinstall
installation.add_additional_packages("gnome gnome-tweaks gdm")
# Note: gdm should be part of the gnome group, but adding it here for clarity

2
profiles/applications/i3-gaps.py
View File

@ -1,2 +0,0 @@
import archinstall
installation.add_additional_packages("i3-gaps")

2
profiles/applications/i3-wm.py
View File

@ -1,2 +0,0 @@
import archinstall
installation.add_additional_packages("i3-wm")

5
profiles/applications/kde.py
View File

@ -1,5 +0,0 @@
import archinstall
packages = "plasma-meta konsole kate dolphin sddm plasma-wayland-session"
if "nvidia" in _gfx_driver_packages:
packages = packages + " egl-wayland"
installation.add_additional_packages(packages)

3
profiles/applications/lxqt.py
View File

@ -1,3 +0,0 @@
import archinstall
installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad slock sddm")

3
profiles/applications/mate.py
View File

@ -1,3 +0,0 @@
import archinstall
installation.add_additional_packages("mate mate-extra lightdm lightdm-gtk-greeter")

3
profiles/applications/sway.py
View File

@ -1,3 +0,0 @@
import archinstall
__packages__ = "sway swaylock swayidle waybar dmenu light grim slurp pavucontrol alacritty"
installation.add_additional_packages(__packages__)

3
profiles/applications/xfce4.py
View File

@ -1,3 +0,0 @@
import archinstall
__packages__ = "xfce4 xfce4-goodies lightdm lightdm-gtk-greeter"
installation.add_additional_packages(__packages__)

5
profiles/awesome.py
View File

@ -6,7 +6,7 @@ is_top_level_profile = False
# New way of defining packages for a profile, which is iterable and can be used out side
# of the profile to get a list of "what packages will be installed".
__packages__ = ['nemo', 'gpicview-gtk3', 'maim']
__packages__ = ['nemo', 'gpicview-gtk3', 'main', 'alacritty']
def _prep_function(*args, **kwargs):
"""
@ -35,9 +35,6 @@ if __name__ == 'awesome':
installation.add_additional_packages(__packages__)
alacritty = archinstall.Application(installation, 'alacritty')
alacritty.install()
# TODO: Copy a full configuration to ~/.config/awesome/rc.lua instead.
with open(f'{installation.target}/etc/xdg/awesome/rc.lua', 'r') as fh:
awesome_lua = fh.read()

8
profiles/budgie.py
View File

@ -4,6 +4,9 @@ import archinstall
is_top_level_profile = False
# "It is recommended also to install the gnome group, which contains applications required for the standard GNOME experience." - Arch Wiki
__packages__ = ["budgie-desktop", "lightdm", "lightdm-gtk-greeter", "gnome"]
def _prep_function(*args, **kwargs):
"""
Magic function called by the importing installer
@ -27,8 +30,7 @@ if __name__ == 'budgie':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application budgie from the template under /applications/
budgie = archinstall.Application(installation, 'budgie')
budgie.install()
# Install the Budgie packages
installation.add_additional_packages(__packages__)
installation.enable_service('lightdm') # Light Display Manager

7
profiles/cinnamon.py
View File

@ -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
@ -27,8 +29,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

6
profiles/deepin.py
View File

@ -4,6 +4,7 @@ import archinstall, os
is_top_level_profile = False
__packages__ = ["deepin", "deepin-terminal", "deepin-editor"]
def _prep_function(*args, **kwargs):
"""
@ -29,9 +30,8 @@ if __name__ == 'deepin':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application deepin from the template under /applications/
deepin = archinstall.Application(installation, 'deepin')
deepin.install()
# Install the Deepin packages
installation.add_additional_packages(__packages__)
# Enable autostart of Deepin for all users
installation.enable_service('lightdm')

8
profiles/gnome.py
View File

@ -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
@ -28,9 +31,8 @@ if __name__ == 'gnome':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application gnome from the template under /applications/
gnome = archinstall.Application(installation, 'gnome')
gnome.install()
# Install the GNOME packages
installation.add_additional_packages(__packages__)
installation.enable_service('gdm') # Gnome Display Manager
# We could also start it via xinitrc since we do have Xorg,

3
profiles/i3.py
View File

@ -60,5 +60,4 @@ if __name__ == 'i3':
installation.enable_service('lightdm')
# install the i3 group now
i3 = archinstall.Application(installation, archinstall.storage['_i3_configuration'])
i3.install()
installation.add_additional_packages(installation, archinstall.storage['_i3_configuration'])

7
profiles/kde.py
View File

@ -4,6 +4,8 @@ import archinstall, os
is_top_level_profile = False
__packages__ = ["plasma-meta", "konsole", "kate", "dolphin", "sddm", "plasma-wayland-session", "egl-wayland"]
# TODO: Remove hard dependency of bash (due to .bash_profile)
def _prep_function(*args, **kwargs):
@ -37,9 +39,8 @@ if __name__ == 'kde':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application kde from the template under /applications/
kde = archinstall.Application(installation, 'kde')
kde.install()
# Install the KDE packages
installation.add_additional_packages(__packages__)
# Enable autostart of KDE for all users
installation.enable_service('sddm')

7
profiles/lxqt.py
View File

@ -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
@ -28,8 +30,7 @@ if __name__ == 'lxqt':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application xfce4 from the template under /applications/
xfce = archinstall.Application(installation, 'lxqt')
xfce.install()
# Install the LXQt packages
installation.add_additional_packages(__packages__)
installation.enable_service('sddm') # SDDM Display Manager

7
profiles/mate.py
View File

@ -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
@ -27,8 +29,7 @@ if __name__ == 'mate':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application mate from the template under /applications/
mate = archinstall.Application(installation, 'mate')
mate.install()
# Install the MATE packages
installation.add_additional_packages(__packages__)
installation.enable_service('lightdm') # Light Display Manager

7
profiles/sway.py
View File

@ -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
@ -24,6 +26,5 @@ def _prep_function(*args, **kwargs):
# through importlib.util.spec_from_file_location("sway", "/somewhere/sway.py")
# or through conventional import sway
if __name__ == 'sway':
# Install the application sway from the template under /applications/
sway = archinstall.Application(installation, 'sway')
sway.install()
# Install the Sway packages
installation.add_additional_packages(__packages__)

7
profiles/xfce4.py
View File

@ -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
@ -28,8 +30,7 @@ if __name__ == 'xfce4':
# Install dependency profiles
installation.install_profile('xorg')
# Install the application xfce4 from the template under /applications/
xfce = archinstall.Application(installation, 'xfce4')
xfce.install()
# Install the XFCE4 packages
installation.add_additional_packages(__packages__)
installation.enable_service('lightdm') # Light Display Manager