fix: cleanup

config

@@ -16,23 +16,25 @@ shell=bash
 
 hostname="$username-pc"
 
-tz=Europe/Paris
+tz=UTC        # Europe/Paris
 locales=en_US # en_US,fr_FR
 lang=en_US
 
 pkg=(
+    7zip unrar
     base-devel man-{db,pages} tldr
-    bash-completion fzf
+    bash-completion
+    detox
     dosfstools exfatprogs
     fastfetch
+    fzf
     git
-    iwd iptables-nft wireguard-tools bind gnu-netcat
+    iwd iptables-nft wireguard-tools gnu-netcat
     jq
     lf
     neovim{,-lspconfig} python-{pynvim,black} ripgrep bash-language-server pyright
     opendoas
     openssh
-    p7zip unrar
     podman docker-compose
     reflector
     renameutils perl-rename

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 ghostscript \
-    imagemagick \
     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 \

rootfs/etc/mkinitcpio.d/linux.preset

@@ -1,3 +1,3 @@
-ALL_kver="/boot/vmlinuz-linux"
+ALL_kver='/boot/vmlinuz-linux'
 PRESETS=('default')
-default_uki="/efi/EFI/Linux/arch-linux.efi"
+default_uki='/efi/EFI/Linux/arch-linux.efi'

rootfs/etc/nftables.conf

@@ -1,26 +1,30 @@
 #!/usr/bin/nft -f
 # vim:set ts=2 sw=2 et:
 
-flush ruleset
+destroy table inet filter;
-
 table inet filter {
   chain input {
     type filter hook input priority filter; policy drop;
 
     #tcp dport 32768-65535 counter meta nftrace set 1 accept comment "WoW VoiceError:17"
 
-    ct state invalid               counter drop
+    ct state invalid                counter drop
-    ct state {established,related} counter accept
+    ct state {established, related} counter accept
 
     iif "lo"                  counter accept
     ip protocol {icmp,icmpv6} counter accept
 
+    iifname "waydroid0" meta l4proto {tcp, udp} th dport {53, 67} counter accept
+
     counter meta nftrace set 1 comment "dropped"
   }
 
   chain forward {
     type filter hook forward priority filter; policy drop;
 
+    iifname "waydroid0" counter accept
+    oifname "waydroid0" counter accept
+
     counter meta nftrace set 1 comment "dropped"
   }
 

rootfs/etc/xdg/reflector/reflector.conf

@@ -1,4 +1,3 @@
 --save /etc/pacman.d/mirrorlist
 --protocol https
---latest 5
+--sort score
---sort rate