cleaup: packages

modules/00-prechroot/00-disk.sh

@@ -29,7 +29,7 @@ mkdir -p /mnt/etc/ /mnt/efi/EFI/Linux/
 
 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	0 2
+UUID=$(blkid "$esp" -ovalue -sUUID)	/efi	vfat	rw,umask=0077	0 2
 EOF
 
 if [ -n "$swapfile" ]; then

modules/00-prechroot/10-pkg.sh

@@ -1,17 +1,30 @@
 #!/bin/bash
 #shellcheck disable=SC2154
 
-case "$(lscpu)" in
-    *AMD*)   printf '%s\n' amd-ucode   >> pkglist.txt ;;
-    *Intel*) printf '%s\n' intel-ucode >> pkglist.txt ;;
-esac
-
 if ls /sys/class/power_supply/BAT* &> /dev/null; then
     printf '%s\n' tlp >> pkglist.txt
 fi
 
+cat <<EOF >> pkglist.txt
+    archlinux-keyring
+    efibootmgr
+    linux{,-lts,-firmware}
+    mkinitcpio
+    pacman
+    sbctl
+EOF
+
+case "$(lscpu)" in
+    *AMD*)   printf '%s\n' amd-ucode   ;;
+    *Intel*) printf '%s\n' intel-ucode ;;
+esac >> pkglist.txt
+case "$(lspci | grep 'VGA\|3D')" in
+    *AMD*)    printf '%s\n' vulkan-radeon mesa ;;
+    *Intel*)  printf '%s\n' vulkan-intel intel-media-driver ;;
+    *NVIDIA*) printf '%s\n' vulkan-nouveau mesa ;;
+esac >> pkglist.txt
+
 printf '%s\n' "$shell" >> pkglist.txt
-pacstrap -C rootfs/etc/pacman.conf -K /mnt \
-    linux{,-lts,-firmware} efibootmgr sbctl pacman archlinux-keyring mkinitcpio - < pkglist.txt
+pacstrap -C rootfs/etc/pacman.conf -K /mnt - < pkglist.txt
 
 find /mnt/etc/ -name '*.pacnew' -delete

modules/desktop.sh

@@ -22,12 +22,5 @@ printf '%s\n' \
     zathura-pdf-poppler \
         >> pkglist.txt
 
-case "$(lspci | grep 'VGA\|3D')" in
-    *AMD*)    printf '%s\n' vulkan-radeon mesa >> pkglist.txt ;;
-    *Intel*)  printf '%s\n' vulkan-intel intel-media-driver >> pkglist.txt ;;
-    *NVIDIA*) printf '%s\n' vulkan-nouveau mesa >> pkglist.txt ;;
-    *) ;;
-esac
-
 find ./modules/ -name '*.sh.desktop' -exec rename '.desktop' '' '{}' +
 bash ./modules/base.sh

modules/dwm.sh

@@ -7,14 +7,12 @@ printf '%s\n' \
         >> pkglist.txt
 
 case "$(lsmod)" in
-    *amdgpu*) printf '%s\n' xf86-video-amdgpu >> pkglist.txt ;;
+    *amdgpu*) printf '%s\n' xf86-video-amdgpu ;;
+    *nouveau*) printf '%s\n' xf86-video-nouveau ;;
 
     # https://wiki.archlinux.org/title/Intel_graphics#Installation
     #*i915*) printf '%s\n' xf86-video-intel >> pkglist.txt ;;
-
-    # https://bugs.freedesktop.org/show_bug.cgi?id=94844#c3
-    #*nouveau*) printf '%s\n' xf86-video-nouveau >> pkglist.txt ;;
-esac
+esac >> pkglist.txt
 
 find ./modules/ -name '*.sh.dwm' -exec rename '.dwm' '' '{}' +
 bash ./modules/desktop.sh

rootfs/etc/makepkg.conf

@@ -161,5 +161,5 @@ SRCEXT='.src.tar.gz'
 #########################################################################
 #
 #-- Command used to run pacman as root, instead of trying sudo and su
-PACMAN_AUTH=(run0 --background=)
+PACMAN_AUTH=(sudo)
 # vim: set ft=sh ts=2 sw=2 et:

rootfs/etc/qemu/bridge.conf

@@ -0,0 +1 @@
+allow br0

rootfs/usr/local/bin/docker

@@ -0,0 +1 @@
+/usr/bin/podman

rootfs/usr/local/bin/sudo

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+run0 --background= "$@"