Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ This will install the pre-commit hook and run it every time a `git commit` is ex

If you'd like to contribute to the documentation, refer to [this guide](docs/README.md) on how to build the documentation locally.

## Package inventory

`archinstall-meta/PKGBUILD` is generated from the installer package choices, applications, and profiles. Add installer-only package choices to `InstallationPackage`; profiles and application package properties are discovered automatically. New profile settings must also be covered in `PROFILE_SETTINGS` in `archinstall/lib/packages/meta.py`.

After changing package choices, run `python -m archinstall.lib.packages.meta` and commit the generated PKGBUILD with the source change. Package groups are listed by name, as archinstall installs them. The pytest suite rejects untracked literal package choices and fails when the committed PKGBUILD differs from the generated one. Do not edit it by hand.

## Submitting Changes

Archinstall uses GitHub's pull-request workflow and all contributions in terms of code should be done through pull requests.<br>
Expand Down
229 changes: 229 additions & 0 deletions archinstall-meta/PKGBUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
# Generated by python -m archinstall.lib.packages.meta

pkgname=archinstall-meta
pkgver=1
pkgrel=1
pkgdesc="Package inventory for archinstall"
arch=(any)
url="https://github.com/archlinux/archinstall"
license=(GPL-3.0-only)
depends=(archinstall)
optdepends=(
alacritty
alsa-firmware
alsa-utils
amd-ucode
apache
awesome
base
bluez
bluez-utils
breeze-icons
brightnessctl
brltty
bspwm
btrfs-progs
budgie
cava
cinnamon
cockpit
cockpit-packagekit
cockpit-storaged
cosmic
cosmic-greeter
cronie
cups
cups-pk-helper
deepin
deepin-editor
deepin-terminal
dkms
dmenu
dms-shell
docker
dolphin
dunst
efibootmgr
engrampa
enlightenment
espeakup
f2fs-tools
feh
firewalld
foot
fuzzel
gdm
ghostscript
git
gnome
gnome-keyring
gnome-screenshot
gnome-terminal
gnome-tweaks
gnu-free-fonts
greetd
grim
grub
grub-btrfs
gst-plugin-pipewire
gvfs
gvfs-smb
htop
hyprland
i3-wm
i3blocks
i3lock
i3status
inotify-tools
intel-media-driver
intel-ucode
iwd
kimageformats
kitty
l3afpad
labwc
libfido2
libpulse
libva-intel-driver
libva-nvidia-driver
libvpl
lightdm
lightdm-gtk-greeter
lightdm-slick-greeter
lighttpd
limine
linux
linux-firmware
linux-firmware-liquidio
linux-firmware-marvell
linux-firmware-mellanox
linux-firmware-nfp
linux-firmware-qcom
linux-firmware-qlogic
linux-hardened
linux-hardened-headers
linux-headers
linux-lts
linux-lts-headers
linux-rt
linux-rt-headers
linux-rt-lts
linux-rt-lts-headers
linux-zen
linux-zen-headers
lvm2
lxqt
ly
mako
mariadb
mate
mate-extra
mate-terminal
materia-gtk-theme
matugen
mesa
mkinitcpio
nano
nemo
nemo-fileroller
network-manager-applet
networkmanager
nginx
niri
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
nvidia-open
nvidia-open-dkms
openssh
oxygen-icons
pam-u2f
papirus-icon-theme
pavucontrol
pipewire
pipewire-alsa
pipewire-jack
pipewire-pulse
plasma
plasma-desktop
plasma-login-manager
plasma-meta
plymouth
polkit
polkit-kde-agent
postgresql
power-profiles-daemon
pulseaudio
qt5-wayland
qt6-wayland
qtile
refind
river
rxvt-unicode
sddm
seatd
slock
slurp
smartmontools
snapper
sof-firmware
sudo
sway
swaybg
swayidle
swaylock
sxhkd
system-config-printer
terminology
terminus-font
timeshift
tomcat10
ttf-dejavu
ttf-freefont
ttf-liberation
tuned
tuned-ppd
ufw
uwsm
vim
vpl-gpu-rt
vulkan-intel
vulkan-nouveau
vulkan-radeon
waybar
wget
wireplumber
wmenu
wofi
wpa_supplicant
xarchiver
xdg-desktop-portal-gnome
xdg-desktop-portal-hyprland
xdg-desktop-portal-wlr
xdg-user-dirs
xdg-user-dirs-gtk
xdg-utils
xdo
xed
xf86-video-amdgpu
xf86-video-ati
xf86-video-nouveau
xfce4
xfce4-goodies
xfsprogs
xmonad
xmonad-contrib
xmonad-extras
xorg-server
xorg-xinit
xorg-xrandr
xorg-xwayland
xsel
xss-lock
xterm
zram-generator
)

package() {
:
}
5 changes: 3 additions & 2 deletions archinstall/applications/audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from archinstall.lib.hardware import SysInfo
from archinstall.lib.log import debug
from archinstall.lib.models.application import Audio, AudioConfiguration
from archinstall.lib.models.package_types import InstallationPackage
from archinstall.lib.models.users import User

if TYPE_CHECKING:
Expand Down Expand Up @@ -67,10 +68,10 @@ def install(
return

if SysInfo.requires_sof_fw():
install_session.add_additional_packages('sof-firmware')
install_session.add_additional_packages(InstallationPackage.SOF_FIRMWARE.value)

if SysInfo.requires_alsa_fw():
install_session.add_additional_packages('alsa-firmware')
install_session.add_additional_packages(InstallationPackage.ALSA_FIRMWARE.value)

match audio_config.audio:
case Audio.PIPEWIRE:
Expand Down
3 changes: 2 additions & 1 deletion archinstall/default_profiles/desktop.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from archinstall.default_profiles.profile import CustomSetting, DisplayServerType, GreeterType, Profile, ProfileType, SelectResult
from archinstall.lib.log import info
from archinstall.lib.menu.helpers import Selection
from archinstall.lib.models.package_types import InstallationPackage
from archinstall.lib.profile.profiles_handler import profile_handler
from archinstall.tui.menu_item import MenuItem, MenuItemGroup
from archinstall.tui.result import ResultType
Expand Down Expand Up @@ -112,7 +113,7 @@ def install(self, install_session: Installer) -> None:
install_session.enable_service(profile.services)

if not xorg_installed and profile.display_server == DisplayServerType.Xorg:
install_session.add_additional_packages(['xorg-server', 'xorg-xinit'])
install_session.add_additional_packages([InstallationPackage.XORG_SERVER.value, InstallationPackage.XORG_XINIT.value])
xorg_installed = True

profile.install(install_session)
2 changes: 1 addition & 1 deletion archinstall/default_profiles/desktops/niri_dms.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def __init__(self) -> None:
def packages(self) -> list[str]:
return [
'niri',
'dms-shell-niri',
'dms-shell',
'polkit',
'xdg-desktop-portal-gnome',
'xorg-xwayland',
Expand Down
3 changes: 2 additions & 1 deletion archinstall/lib/authentication/authentication_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from archinstall.lib.command import SysCommandWorker
from archinstall.lib.log import debug, info
from archinstall.lib.models.authentication import AuthenticationConfiguration, U2FLoginConfiguration, U2FLoginMethod
from archinstall.lib.models.package_types import InstallationPackage
from archinstall.lib.models.users import User
from archinstall.lib.translationhandler import tr

Expand Down Expand Up @@ -79,7 +80,7 @@ def _configure_u2f_mapping(
) -> None:
debug(f'Setting up U2F login: {u2f_config.u2f_login_method.value}')

install_session.pacman.strap('pam-u2f')
install_session.pacman.strap(InstallationPackage.PAM_U2F.value)

print(tr('Setting up U2F login: {}').format(u2f_config.u2f_login_method.value))

Expand Down
Loading