config

@@ -1,4 +1,5 @@
 # User Variables
+# Comment to disable
 # shellcheck disable=SC2034
 
 install_type=dwm # base|desktop|dwm
@@ -6,35 +7,34 @@ install_type=dwm # base|desktop|dwm
 disk=/dev/nvme0n1
 disk_passwd=cryptroot
 
-swapfile=1024 # MiB, Comment to disable
+swapfile=1024 # MiB
 
 username=ange
 userpasswd=ange
-rootpasswd=root # Comment to disable
+rootpasswd=root
 
 shell=bash
 
 hostname="$username-pc"
 
-tz=UTC        # Europe/Paris
+tz=Europe/Paris
-locales=en_US # en_US,fr_FR
+locales=en_US # 'en_US,fr_FR'
 lang=en_US
 
 pkg=(
-    7zip unrar
     base-devel man-{db,pages} tldr
-    bash-completion
+    bash-completion fzf
-    detox
     dosfstools exfatprogs
+    efibootmgr
     fastfetch
-    fzf
     git
-    iwd iptables-nft wireguard-tools gnu-netcat
+    iwd iptables-nft wireguard-tools bind 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

install.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-echo 'If you want Secure Boot support, you need to put your system in Setup Mode'
-read -r
-
 exec &> >(tee logs.out)
 
 set -a

modules/10-chroot/10-bootloader.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-#shellcheck disable=SC2154
-
-root="$(findmnt -n -osource /)"
-boot="$(lsblk -ls -oname /dev/disk/by-partlabel/boot | tail -n1)"
-
-cryptdev="$(cryptsetup status "$root" | awk '/device/ {print $2}')"
-[ -n "$cryptdev" ] && {
-    uuid="$(blkid | grep "$cryptdev" | awk '{print $2}')"
-    options="cryptdevice=$uuid:${root##*/} "
-}
-
-options="${options}root=$root rw"
-
-sbctl create-keys
-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"
-done
-echo "$options" > /etc/cmdline.d/root.conf

modules/base.sh

@@ -1,21 +1,21 @@
 #!/bin/bash
 #shellcheck disable=SC2154
 
-for i in modules/00-prechroot/*.sh; do
+for i in modules/prechroot/*.sh; do
     bash -x "$i"
 done
 
 cp -r modules/chroot/ /mnt/
 
-for i in modules/10-chroot/*.sh; do
+for i in modules/chroot/*.sh; do
     arch-chroot /mnt bash -x "${i/modules/}"
 done
 
-for i in modules/10-chroot/user/*.sh; do
+for i in modules/chroot/user/*.sh; do
     arch-chroot /mnt su - "$username" -c "bash -x '${i/modules/}'"
 done
 
-for i in modules/20-postchroot/*.sh; do
+for i in modules/postchroot/*.sh; do
     bash -x "$i"
 done
 

modules/chroot/10-bootloader.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+#shellcheck disable=SC2154
+
+bootctl install
+
+root="$(findmnt -nr -o source /)"
+
+cryptdev="$(cryptsetup status "$root" | awk '/device/ {print $2}')"
+[ -n "$cryptdev" ] && {
+    uuid="$(blkid | grep "$cryptdev" | awk '{print $2}')"
+    options="cryptdevice=$uuid:$(basename "$root") "
+}
+
+options="${options}root=$root"
+
+for f in /boot/loader/entries/*.conf; do
+    cat << EOF >> "$f"
+options $options rw
+EOF
+done

modules/chroot/20-users.sh

@@ -4,5 +4,5 @@
 shell="$(sed -n "/$shell/{p;q}" /etc/shells)"
 useradd -mG wheel,video "$username" -s "${shell:-/bin/bash}"
 
-[ -n "$rootpasswd" ] && echo "root:$rootpasswd" | chpasswd
+echo "root:$rootpasswd"      | chpasswd
 echo "$username:$userpasswd" | chpasswd

modules/chroot/50-dwm.sh.dwm

@@ -1,5 +1,4 @@
 #!/bin/bash
-#shellcheck disable=SC2154
 
 git clone --depth 1 https://git.maby.dev/ange/.dotfiles.git /tmp/dotfiles
 /tmp/dotfiles/.config/suckless/update.sh

modules/chroot/user/10-services.sh

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

modules/desktop.sh

@@ -6,9 +6,11 @@ printf '%s\n' \
     aerc w3m \
     alacritty \
     bluez{,-utils} \
+    dunst libnotify \
     feh \
     gammastep \
-    imagemagick ghostscript \
+    graphicsmagick ghostscript \
+    gvfs{,-gphoto2,-mtp} \
     materia-gtk-theme papirus-icon-theme \
     monero \
     mpv \
@@ -18,7 +20,6 @@ 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} \
@@ -33,9 +34,9 @@ printf '%s\n' \
         >> modules/chroot/flatpak.txt
 
 case "$(lspci | grep 'VGA\|3D')" in
-    *AMD*)    echo vulkan-radeon mesa >> pkglist.txt ;;
+    *AMD*)    echo vulkan-radeon libva-mesa-driver mesa-vdpau >> pkglist.txt ;;
     *Intel*)  echo vulkan-intel intel-media-driver >> pkglist.txt ;;
-    *NVIDIA*) echo vulkan-nouveau mesa >> pkglist.txt ;;
+    *NVIDIA*) echo vulkan-nouveau libva-mesa-driver mesa-vdpau >> pkglist.txt ;;
     *) ;;
 esac
 

modules/dwm.sh

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

modules/prechroot/10-disk.sh

@@ -2,11 +2,11 @@
 #shellcheck disable=SC2154
 
 sgdisk -Z \
-    -n '0:0:+512M' -t '0:ef00' -c '0:esp' \
+    -n '0:0:+512M' -t '0:ef00' -c '0:boot' \
     -n '0:0:0'     -t '0:8300' -c '0:root' \
     "$disk"
 
-esp=/dev/disk/by-partlabel/esp
+boot=/dev/disk/by-partlabel/boot
 root=/dev/disk/by-partlabel/root
 
 [ -n "$disk_passwd" ] && {
@@ -15,25 +15,21 @@ root=/dev/disk/by-partlabel/root
     root=/dev/mapper/cryptroot
 }
 
-sleep 5 # wait /dev/disk/by-partlabel/
+sleep 2 # wait for /dev/disk/by-partlabel/ to be populated
 
-mkfs.vfat -F32 "$esp"
+mkfs.fat -F32 "$boot"
 mkfs.ext4 -F "$root"
 mount "$root" /mnt/
-
+mount -m -o fmask=0077,dmask=0077 /dev/disk/by-partlabel/boot /mnt/boot/
-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" ] && {
     dd if=/dev/zero of=/mnt/swapfile bs=1M count="$swapfile" status=progress
     chmod 600 /mnt/swapfile
     mkswap /mnt/swapfile
     swapon /mnt/swapfile
-    echo "/swapfile	none	swap	defaults	0 0" >> /mnt/etc/fstab
 }
 
 cp -rfTv rootfs/ /mnt/
 
+genfstab -U /mnt/ >> /mnt/etc/fstab
 swapoff /mnt/swapfile

modules/prechroot/20-pkg.sh

@@ -12,8 +12,7 @@ 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} efibootmgr sbctl - < pkglist.txt
+    base linux{,-lts,-firmware} "$shell" - < pkglist.txt
 
 find /mnt/etc/ -name '*.pacnew' -delete

rootfs/boot/loader/entries/arch-lts.conf

@@ -0,0 +1,3 @@
+title   Arch Linux LTS
+linux   /vmlinuz-linux-lts
+initrd  /initramfs-linux-lts.img

rootfs/boot/loader/entries/arch.conf

@@ -0,0 +1,3 @@
+title   Arch Linux
+linux   /vmlinuz-linux
+initrd  /initramfs-linux.img

rootfs/boot/loader/loader.conf

@@ -0,0 +1 @@
+default arch

rootfs/etc/mkinitcpio.d/linux-lts.preset

@@ -1,3 +0,0 @@
-ALL_kver='/boot/vmlinuz-linux-lts'
-PRESETS=('fallback')
-fallback_uki='/efi/EFI/Linux/arch-linux-lts-fallback.efi'

rootfs/etc/mkinitcpio.d/linux.preset

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

rootfs/etc/modprobe.d/nobeep.conf

@@ -1 +1,2 @@
 blacklist pcspkr
+blacklist snd_pcsp

rootfs/etc/nftables.conf

@@ -1,30 +1,26 @@
 #!/usr/bin/nft -f
 # vim:set ts=2 sw=2 et:
 
-destroy table inet filter;
+flush ruleset
+
 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"
+    #tcp dport 32768-40960 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/pacman.conf

@@ -35,8 +35,6 @@ Color
 CheckSpace
 VerbosePkgLists
 ParallelDownloads = 8
-DownloadUser = alpm
-#DisableSandbox
 ILoveCandy
 
 # By default, pacman accepts packages signed by keys that its local keyring

rootfs/etc/pacman.d/hooks/10-systemd-boot.hook

@@ -0,0 +1,9 @@
+[Trigger]
+Type = Package
+Operation = Upgrade
+Target = systemd
+
+[Action]
+Description = Gracefully upgrading systemd-boot...
+When = PostTransaction
+Exec = /usr/bin/systemctl restart systemd-boot-update.service

rootfs/etc/xdg/reflector/reflector.conf

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