setup: overall improvements; switch from snapd to flatpak

arch-flatpak-packages.txt

@@ -0,0 +1,2 @@
+com.discordapp.Discord
+com.spotify.Client

arch-gnome-packages.txt

@@ -2,10 +2,12 @@ alacritty
 cups
 cups-filters
 firefox
+flatpak
 fontconfig
 geary
 ghostscript
 gimp
+hplip
 libreoffice-fresh
 libva-vdpau-driver
 nautilus-share
@@ -18,7 +20,6 @@ qemu
 qemu-arch-extra
 screenfetch
 shotwell
-snapd
 spotify
 sushi
 texlive-most

arch-packages-generic.txt

@@ -22,7 +22,6 @@ perl-net-smtp-ssl
 python
 python-capstone
 python-pip
-rustup
 sleuthkit
 speedometer
 squashfs-tools
@@ -31,7 +30,6 @@ tar
 thefuck
 unrar
 xz
-yarn
 z
 zsh
 zsh-autosuggestions

arch-snaps.txt

@@ -1,2 +0,0 @@
-discord
-spotify

setup-archlinux.sh

@@ -4,10 +4,10 @@ set -e
 set -u
 
 YAY_OPTIONS="--sudoloop --noconfirm --nodiffmenu --noeditmenu --noupgrademenu"
-ARCH_PACKAGE_LIST_GENERIC=arch-packages-generic.txt
-ARCH_PACKAGE_LIST_GUI=arch-gnome-packages.txt
-ARCH_GNOME_PACKAGE_LIST_UNNEEDED=arch-gnome-packages-unneeded.txt
-ARCH_SNAP_LIST=arch-snaps.txt
+ARCH_PACKAGES_GENERIC=arch-packages-generic.txt
+ARCH_GNOME_PACKAGES=arch-gnome-packages.txt
+ARCH_GNOME_PACKAGES_UNWANTED=arch-gnome-packages-unwanted.txt
+ARCH_FLATPAK_PACKAGES=arch-flatpak-packages.txt
 
 [ -z ${WITH_GUI+x} ] && WITH_GUI=n || true
 
@@ -32,23 +32,18 @@ fi
 yay -Syu $YAY_OPTIONS
 
 # Install all wanted packages
-yay -S $YAY_OPTIONS --needed - < $ARCH_PACKAGE_LIST_GENERIC
+yay -S $YAY_OPTIONS --needed - < $ARCH_PACKAGES_GENERIC
 
 if [[ $WITH_GUI == y ]]; then
-    yay -S $YAY_OPTIONS --needed - < $ARCH_PACKAGE_LIST_GUI
+    yay -S $YAY_OPTIONS --needed - < $ARCH_GNOME_PACKAGES
 
-    for p in $(cat $ARCH_GNOME_PACKAGE_LIST_UNNEEDED); do
+    for p in $(cat $ARCH_GNOME_PACKAGES_UNWANTED); do
         yay -Q $p >/dev/null 2>&1 && yay -Rncs $p || true
     done
 
-    # Setup snapd
-    sudo systemctl enable --now snapd
-    systemctl enable --now snapd
-    sudo snap install $(cat $ARCH_SNAP_LIST)
+    flatpak install --user --assumeyes --noninteractive $(cat $ARCH_FLATPAK_PACKAGES)
 fi
 
-yay -Qs hplib && yay -Rns hplib || true
-
 # Clean up package cache
 yay -Scc --noconfirm