From 4c59dbce3066dbef081b5e86c8f6e900fc55714c Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Sat, 2 Jul 2022 16:10:31 +0200 Subject: [PATCH] Overhaul package lists for installation of a new system Signed-off-by: Knut Ahlers --- .gitignore | 1 + PKGBUILD | 253 +++++++++++++++++++++++++++-------------------------- 2 files changed, 129 insertions(+), 125 deletions(-) diff --git a/.gitignore b/.gitignore index 468cd87..b6d3d24 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +*.pkg.tar.* *.pkg.tar.xz diff --git a/PKGBUILD b/PKGBUILD index 3256226..4337a11 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,11 +2,11 @@ pkgbase=luzifer pkgname=( - luzifer-base - luzifer-devel - luzifer-gui + luzifer-base + luzifer-devel + luzifer-gui ) -pkgver=0.5.2 +pkgver=0.6.0 pkgrel=1 pkgdesc='System configuration for @luzifer systems' arch=(any) @@ -17,146 +17,149 @@ groups=(luzifer) rootdir=${PWD} package_luzifer-base() { - provides=(vim vi) - conflicts=(vim vi) - install=luzifer-base.install + provides=(vim vi) + conflicts=(vim vi) + install=luzifer-base.install - # Build on former Archlinux base group (pacman -Qgq base | xargs | fold -sw 72) - # Packages removed: vi - # Packages added: base (new Base-Meta-Package, essentially containing a subset of these) - depends=( - base bash bzip2 coreutils cryptsetup device-mapper dhcpcd diffutils - e2fsprogs file filesystem findutils gawk gcc-libs gettext glibc grep - gzip inetutils iproute2 iputils jfsutils less licenses linux - linux-firmware logrotate lvm2 man-db man-pages mdadm nano netctl pacman - pciutils perl procps-ng psmisc reiserfsprogs s-nail sed - shadow sysfsutils systemd-sysvcompat tar texinfo usbutils util-linux - which xfsprogs - ) + # Build on former base package + depends=( + base + ) - # Add system utils - depends+=( - curl - ddrescue - dust - envrun - exa - expect - gocryptfs - jq - pacman-contrib - ripgrep - rsync - sudo - tmux - unzip - wget - ) + # Add basic system packages (formerly in "base" group) + depends+=( + cryptsetup + e2fsprogs + less + linux + linux-firmware + logrotate + lvm2 + man-db + man-pages + mdadm + netctl + usbutils + util-linux + which + xfsprogs + ) - # Add debugging utils - depends+=( - bind-tools - htop - iotop - lsof - mtr - nmap - socat - ) + # Add system utils + depends+=( + curl + ddrescue + dust + envrun + exa + expect + gocryptfs + jq + pacman-contrib + peco + ripgrep + rsync + sudo + tmux + unzip + vault-bin + wget + ) - # Add network utils - depends+=( - openssh - ) + # Add debugging utils + depends+=( + bind-tools + htop + iotop + lsof + mtr + nmap + socat + ) - # Add shell - depends+=(zsh) + # Add network utils + depends+=( + openssh + ) - # Add editor - depends+=(neovim python-pynvim) + # Add shell + depends+=(zsh) - # Add script dependencies - depends+=( - python - python-requests - ) + # Add editor + depends+=(neovim python-pynvim) - cp -a "$rootdir/base/"* "$pkgdir" + # Add script dependencies + depends+=( + python + python-requests + ) + + cp -a "$rootdir/base/"* "$pkgdir" } package_luzifer-devel() { - # Start with Archlinux base-devel group (pacman -Qgq base-devel | xargs | fold -sw 72) - depends=( - autoconf automake binutils bison fakeroot file findutils flex gawk gcc - gettext grep groff gzip libtool m4 make pacman patch pkgconf sed sudo - systemd texinfo util-linux which - ) + # Start with Archlinux base-devel group (pacman -Sg base-devel | cut -d ' ' -f 2 | xargs | fold -sw 72) + depends=( + autoconf automake binutils bison fakeroot file findutils flex gawk gcc + gettext grep groff gzip libtool m4 make pacman patch pkgconf sed sudo + texinfo which + ) - # Apply my base package - depends+=(luzifer-base) + # Apply my base package + depends+=(luzifer-base) - # Add dev specific tools - depends+=( - autopep8 - aws-cli - docker - git - go - ) + # Add dev specific tools + depends+=( + autopep8 + aws-cli + diffutils + docker + git + go + ) } package_luzifer-gui() { - install=luzifer-gui.install + install=luzifer-gui.install - depends=(luzifer-base) + depends=(luzifer-base) - # Add fonts - depends+=( - adobe-base-14-fonts - nerd-fonts-dejavu-complete - noto-fonts-emoji - otf-ipafont - ttf-opensans - ttf-roboto - ttf-tahoma - ttf-windows - ) + # Add fonts + depends+=( + adobe-base-14-fonts + nerd-fonts-dejavu-complete + noto-fonts-emoji + otf-ipafont + ttf-opensans + ttf-roboto + ttf-tahoma + ttf-windows + ) - # Add login manager - depends+=( - lightdm - lightdm-gtk-greeter - ) + # Add login manager + depends+=( + lightdm + lightdm-gtk-greeter + xorg-server + ) - # Add i3 (pacman -Qgq i3 | xargs | fold -sw 72) - depends+=( - i3-gaps i3blocks i3lock i3status - ) + # Add i3 (pacman -Sg i3 | cut -d ' ' -f 2 | xargs | fold -sw 72) + depends+=( + i3-gaps i3-wm i3blocks i3lock i3status + ) - # Add GUI environment - depends+=( - alacritty - dex - dialog - dmenu - feh - maim - mupdf - redshift - ) - - # Add Archlinux xorg group (pacman -Qgq xorg | xargs | fold -sw 72) - depends+=( - xf86-video-vesa xorg-bdftopcf xorg-docs xorg-font-util - xorg-fonts-100dpi xorg-fonts-75dpi xorg-fonts-encodings xorg-iceauth - luit xorg-mkfontscale xorg-server xorg-server-common - xorg-server-devel xorg-server-xdmx xorg-server-xephyr xorg-server-xnest - xorg-server-xvfb xorg-server-xwayland xorg-sessreg xorg-setxkbmap - xorg-smproxy xorg-x11perf xorg-xauth xorg-xcmsdb xorg-xcursorgen - xorg-xdpyinfo xorg-xdriinfo xorg-xev xorg-xgamma xorg-xhost xorg-xinput - xorg-xkbcomp xorg-xkbevd xorg-xkbutils xorg-xkill xorg-xlsatoms - xorg-xlsclients xorg-xmodmap xorg-xpr xorg-xprop xorg-xrandr xorg-xrdb - xorg-xrefresh xorg-xset xorg-xsetroot xorg-xvinfo xorg-xwd - xorg-xwininfo xorg-xwud - ) + # Add GUI environment + depends+=( + alacritty + chromium + dex + dialog + dmenu + feh + maim + mupdf + redshift + xbindkeys + xclip + ) }