From d2a9f4443b989ca6bf054870af28e5fbbe1873f9 Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Sun, 21 May 2023 16:16:56 +0200
Subject: [PATCH] Change package installation order

    All packages from official sources are installed before AUR-packages
    Audio packages merged into officialpkgs list
---
 arch-setup/install.sh                 | 35 +++++++++++++++------------
 arch-setup/packages/audiopkgs-old.txt | 10 --------
 arch-setup/packages/audiopkgs.txt     |  8 ------
 arch-setup/packages/officialpkgs.txt  |  7 ++++++
 4 files changed, 27 insertions(+), 33 deletions(-)
 delete mode 100644 arch-setup/packages/audiopkgs-old.txt
 delete mode 100644 arch-setup/packages/audiopkgs.txt

diff --git a/arch-setup/install.sh b/arch-setup/install.sh
index 01574439..e9c3c607 100755
--- a/arch-setup/install.sh
+++ b/arch-setup/install.sh
@@ -234,6 +234,16 @@ echo Installing default pacman programs
 sudo pacman -S --needed --noconfirm - <"$setupdir/packages/officialpkgs.txt"
 echo Installed official programs
 
+# theming
+echo Installing themes and icons
+paru -S --needed --noconfirm - <"$setupdir/packages/theme-packages.txt"
+echo Installed themes and icons
+
+#install wine
+echo Installing wine
+sudo pacman -S --noconfirm --needed - <"$setupdir/packages/winepkgs.txt"
+echo Installed wine
+
 # install paru-bin with yay, or download paru from github
 if [[ $(pacman -Q | grep yay) ]] && [[ ! $(pacman -Q | grep paru) ]]; then
     echo "Installing paru"
@@ -246,26 +256,21 @@ elif [[ ! $(pacman -Q | grep yay) ]] && [[ ! $(pacman -Q | grep paru) ]]; then
     cd ..
 fi
 
-# audio
-echo Installing audio programs
-paru -S --needed --noconfirm - <"$setupdir/packages/audiopkgs.txt"
-echo Installed audio programs
-
 #AUR
 echo Installing default AUR programs
 paru -S --needed - <"$setupdir/packages/aurpkgs.txt"
+# TODO for btrfsmaintenance, use btrfsmaintenance (1)
+# TODO for jellyfin-media-player, use jellyfin-media-player (1)
+# TODO for java-environment, use jdk-openjdk (1)
+# TODO for cargo, use rust (1)
+# TODO for ttf-iosevka, use ttf-iosevka (1)
+# TODO for ttf-ms-fonts, use ttf-ms-fonts (1)
+# TODO for ttf-vista-fonts, use ttf-vista-fonts (1)
+# TODO for wps-office, use wps-office (1)
+# TODO for ffmpeg-normalize, use ffmpeg-normalize (1)
+# TODO for nohang, use nohang (1)
 echo Installed AUR programs
 
-# theming
-echo Installing themes and icons
-paru -S --needed --noconfirm - <"$setupdir/packages/theme-packages.txt"
-echo Installed themes and icons
-
-#install wine
-echo Installing wine
-sudo pacman -S --noconfirm --needed - <"$setupdir/packages/winepkgs.txt"
-echo Installed wine
-
 ###################
 #selected programs#
 ###################
diff --git a/arch-setup/packages/audiopkgs-old.txt b/arch-setup/packages/audiopkgs-old.txt
deleted file mode 100644
index 78c616b0..00000000
--- a/arch-setup/packages/audiopkgs-old.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-alsa-card-profiles
-alsa-utils
-lib32-libpulse
-libcanberra-pulse
-libpulse
-pavucontrol
-pulseaudio
-pulseaudio-alsa
-pulseaudio-bluetooth
-pulseeffects-legacy
diff --git a/arch-setup/packages/audiopkgs.txt b/arch-setup/packages/audiopkgs.txt
deleted file mode 100644
index 52965f57..00000000
--- a/arch-setup/packages/audiopkgs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-alsa-utils
-easyeffects
-pavucontrol
-pipewire
-pipewire-alsa
-pipewire-jack
-pipewire-media-session
-pipewire-pulse
diff --git a/arch-setup/packages/officialpkgs.txt b/arch-setup/packages/officialpkgs.txt
index e9ab3d66..7df371a6 100644
--- a/arch-setup/packages/officialpkgs.txt
+++ b/arch-setup/packages/officialpkgs.txt
@@ -1,5 +1,6 @@
 acpilight
 age
+alsa-utils
 arandr
 bandwhich
 base-devel
@@ -14,6 +15,7 @@ dnsutils
 dosfstools
 dunst
 e2fsprogs
+easyeffects
 exfatprogs
 f2fs-tools
 fakeroot
@@ -83,10 +85,15 @@ os-prober
 os-prober
 p7zip
 pacman-contrib
+pavucontrol
 phonon-qt5-gstreamer
 picom
 piper
+pipewire
+pipewire-alsa
 pipewire-jack
+pipewire-media-session
+pipewire-pulse
 playerctl
 polkit-gnome
 python-dbus