fix: cleanup

modules/00-prechroot/10-disk.sh

@@ -24,7 +24,6 @@ mount "$root" /mnt/
 cat <<EOF > /mnt/etc/fstab
 UUID=$(blkid "$root" -ovalue -sUUID)	/	ext4	rw,relatime	0 1
 UUID=$(blkid "$esp" -ovalue -sUUID)	/efi	vfat	rw,fmask=0077,dmask=0077,noauto	0 2
-
 EOF
 
 [ -n "$swapfile" ] && {

modules/00-prechroot/20-pkg.sh

@@ -12,7 +12,8 @@ esac
 
 [ -d /sys/class/power_supply/BAT0 ] && echo tlp >> pkglist.txt
 
+echo "$shell" >> pkglist.txt
 pacstrap -C rootfs/etc/pacman.conf -K /mnt \
-    base linux{,-lts,-firmware} "$shell" efibootmgr sbctl - < pkglist.txt
+    base linux{,-lts,-firmware} efibootmgr sbctl - < pkglist.txt
 
 find /mnt/etc/ -name '*.pacnew' -delete

modules/10-chroot/10-bootloader.sh

@@ -17,6 +17,6 @@ sbctl enroll-keys
 
 for l in arch{,-lts-fallback}; do
     efibootmgr --create --unicode --label "$l" \
-        --disk "$boot" --part 1 --loader "\EFI\Linux\arch-linux$l.efi"
+        --disk "$boot" --part 1 --loader "\\EFI\\Linux\\arch-linux$l.efi"
 done
 echo "$options" > /etc/cmdline.d/root.conf

modules/10-chroot/user/10-services.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-#shellcheck disable=SC2154
-
-systemctl enable --user podman.socket

modules/desktop.sh

@@ -8,8 +8,7 @@ printf '%s\n' \
     bluez{,-utils} \
     feh \
     gammastep \
-    gvfs{,-gphoto2,-mtp} \
-    imagemagick \
+    imagemagick ghostscript \
     materia-gtk-theme papirus-icon-theme \
     monero \
     mpv \
@@ -19,9 +18,10 @@ printf '%s\n' \
     pipewire{,-pulse,-jack} pavucontrol playerctl \
     polkit-gnome \
     qemu-{base,audio-pipewire,hw-usb-host,hw-display-virtio-{gpu,vga},ui-gtk} dnsmasq \
+    udisks2 \
     xdg-user-dirs \
     yt-dlp \
-    zathura{,-pdf-poppler} ghostscript \
+    zathura{,-pdf-poppler} \
     zenity \
         >> pkglist.txt
 

modules/dwm.sh

@@ -2,7 +2,6 @@
 #shellcheck disable=SC2154
 
 printf '%s\n' \
-    autorandr \
     i3lock xss-lock \
     picom \
     xorg-{server,xinit,xrandr,xsetroot} xclip xdotool \