Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--profiles/applications/alacritty.py3
-rw-r--r--profiles/applications/budgie.py4
-rw-r--r--profiles/applications/cinnamon.py3
-rw-r--r--profiles/applications/deepin.py5
-rw-r--r--profiles/applications/gnome.py4
-rw-r--r--profiles/applications/i3-gaps.py2
-rw-r--r--profiles/applications/i3-wm.py2
-rw-r--r--profiles/applications/kde.py5
-rw-r--r--profiles/applications/lxqt.py3
-rw-r--r--profiles/applications/mate.py3
-rw-r--r--profiles/applications/sway.py3
-rw-r--r--profiles/applications/xfce4.py3
-rw-r--r--profiles/awesome.py5
-rw-r--r--profiles/budgie.py8
-rw-r--r--profiles/cinnamon.py7
-rw-r--r--profiles/deepin.py6
-rw-r--r--profiles/gnome.py8
-rw-r--r--profiles/i3.py3
-rw-r--r--profiles/kde.py7
-rw-r--r--profiles/lxqt.py7
-rw-r--r--profiles/mate.py7
-rw-r--r--profiles/sway.py7
-rw-r--r--profiles/xfce4.py7
23 files changed, 39 insertions, 73 deletions
diff --git a/profiles/applications/alacritty.py b/profiles/applications/alacritty.py
deleted file mode 100644
index aab64bb4..00000000
--- a/profiles/applications/alacritty.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("alacritty") \ No newline at end of file
diff --git a/profiles/applications/budgie.py b/profiles/applications/budgie.py
deleted file mode 100644
index ccec4e14..00000000
--- a/profiles/applications/budgie.py
+++ /dev/null
@@ -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") \ No newline at end of file
diff --git a/profiles/applications/cinnamon.py b/profiles/applications/cinnamon.py
deleted file mode 100644
index 0a1d9cc2..00000000
--- a/profiles/applications/cinnamon.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("cinnamon system-config-printer gnome-keyring gnome-terminal blueberry metacity lightdm lightdm-gtk-greeter")
diff --git a/profiles/applications/deepin.py b/profiles/applications/deepin.py
deleted file mode 100644
index 0db1572d..00000000
--- a/profiles/applications/deepin.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import archinstall
-
-packages = "deepin deepin-terminal deepin-editor"
-
-installation.add_additional_packages(packages)
diff --git a/profiles/applications/gnome.py b/profiles/applications/gnome.py
deleted file mode 100644
index e26290dc..00000000
--- a/profiles/applications/gnome.py
+++ /dev/null
@@ -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
diff --git a/profiles/applications/i3-gaps.py b/profiles/applications/i3-gaps.py
deleted file mode 100644
index 4daed7ad..00000000
--- a/profiles/applications/i3-gaps.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import archinstall
-installation.add_additional_packages("i3-gaps") \ No newline at end of file
diff --git a/profiles/applications/i3-wm.py b/profiles/applications/i3-wm.py
deleted file mode 100644
index e7838a64..00000000
--- a/profiles/applications/i3-wm.py
+++ /dev/null
@@ -1,2 +0,0 @@
-import archinstall
-installation.add_additional_packages("i3-wm") \ No newline at end of file
diff --git a/profiles/applications/kde.py b/profiles/applications/kde.py
deleted file mode 100644
index af1e6597..00000000
--- a/profiles/applications/kde.py
+++ /dev/null
@@ -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)
diff --git a/profiles/applications/lxqt.py b/profiles/applications/lxqt.py
deleted file mode 100644
index 2099f3fa..00000000
--- a/profiles/applications/lxqt.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("lxqt breeze-icons oxygen-icons xdg-utils ttf-freefont leafpad slock sddm")
diff --git a/profiles/applications/mate.py b/profiles/applications/mate.py
deleted file mode 100644
index 24d6be47..00000000
--- a/profiles/applications/mate.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-
-installation.add_additional_packages("mate mate-extra lightdm lightdm-gtk-greeter") \ No newline at end of file
diff --git a/profiles/applications/sway.py b/profiles/applications/sway.py
deleted file mode 100644
index 59921aa0..00000000
--- a/profiles/applications/sway.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-__packages__ = "sway swaylock swayidle waybar dmenu light grim slurp pavucontrol alacritty"
-installation.add_additional_packages(__packages__)
diff --git a/profiles/applications/xfce4.py b/profiles/applications/xfce4.py
deleted file mode 100644
index 9f4260da..00000000
--- a/profiles/applications/xfce4.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import archinstall
-__packages__ = "xfce4 xfce4-goodies lightdm lightdm-gtk-greeter"
-installation.add_additional_packages(__packages__) \ No newline at end of file
diff --git a/profiles/awesome.py b/profiles/awesome.py
index 01566d0f..a5dedccd 100644
--- a/profiles/awesome.py
+++ b/profiles/awesome.py
@@ -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()
diff --git a/profiles/budgie.py b/profiles/budgie.py
index 6c5475ae..fc061cd2 100644
--- a/profiles/budgie.py
+++ b/profiles/budgie.py
@@ -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
diff --git a/profiles/cinnamon.py b/profiles/cinnamon.py
index 91a59811..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
@@ -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
diff --git a/profiles/deepin.py b/profiles/deepin.py
index 52bcdde5..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):
"""
@@ -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')
diff --git a/profiles/gnome.py b/profiles/gnome.py
index c75cafee..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
@@ -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,
diff --git a/profiles/i3.py b/profiles/i3.py
index 148e591e..4d400468 100644
--- a/profiles/i3.py
+++ b/profiles/i3.py
@@ -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']) \ No newline at end of file
diff --git a/profiles/kde.py b/profiles/kde.py
index 6654dfa7..c8efdcde 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", "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')
diff --git a/profiles/lxqt.py b/profiles/lxqt.py
index 871488ee..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
@@ -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
diff --git a/profiles/mate.py b/profiles/mate.py
index b4c697b1..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
@@ -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
diff --git a/profiles/sway.py b/profiles/sway.py
index c3a6e31a..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
@@ -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__)
diff --git a/profiles/xfce4.py b/profiles/xfce4.py
index fee8c37a..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
@@ -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

Copyright © 2002-2022 Judd Vinet and Aaron Griffin. Copyright © 2022 Erich Eckner.
The Arch Linux name and logo are recognized trademarks. Some rights reserved. The registered trademark Linux® is used pursuant to a sublicense from LMI, the exclusive licensee of Linus Torvalds, owner of the mark on a world-wide basis.