bump: 202510

modules/10-chroot/00-bootstrap.sh

@@ -4,11 +4,8 @@
 ln -sf "/usr/share/zoneinfo/$tz" /etc/localtime
 hwclock --systohc
 
-while read -r l; do
-    sed -i "/^#\s*$l.UTF-8/s/^#\s*//" /etc/locale.gen
-done <<< "${locales//,/$'\n'}"
+(IFS='|'; sed -Ei "/^#(${locales[*]})\.UTF-8/s/#//" /etc/locale.gen)
 locale-gen
-
 echo "LANG=$lang.UTF-8" > /etc/locale.conf
 
 echo "$hostname" > /etc/hostname

modules/10-chroot/10-bootloader.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
-#shellcheck disable=SC2154
 
 root="$(findmnt -n -osource /)"
-boot="$(lsblk -ls -oname /dev/disk/by-partlabel/boot | tail -n1)"
+esp="$(lsblk -ls -opath /dev/disk/by-partlabel/esp | tail -n1)"
 
 cryptdev="$(cryptsetup status "$root" | awk '/device/ {print $2}')"
 if [ -n "$cryptdev" ]; then
@@ -15,8 +14,8 @@ options="${options}root=$root rw"
 sbctl create-keys
 sbctl enroll-keys
 
-for l in arch{,-lts-fallback}; do
+for l in arch-linux{,-lts-fallback}; do
     efibootmgr --create --unicode --label "$l" \
-        --disk "$boot" --part 1 --loader "\\EFI\\Linux\\arch-linux$l.efi"
+        --disk "$esp" --part 1 --loader "\\EFI\\Linux\\$l.efi"
 done
 echo "$options" > /etc/cmdline.d/root.conf

modules/10-chroot/30-services.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-#shellcheck disable=SC2154
 
 systemctl enable iwd.service
 systemctl enable nftables.service

modules/10-chroot/50-dwm.sh

@@ -1,5 +0,0 @@
-#!/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/10-chroot/50-dwm.sh.dwm

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+git clone --depth 1 https://git.gmoker.com/ange/dotfiles.git /tmp/dotfiles
+/tmp/dotfiles/.config/suckless/install.sh

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

@@ -1,5 +1,4 @@
 #!/bin/bash
-#shellcheck disable=SC2154
 
 config=(git --git-dir "$HOME/.dotfiles" --work-tree "$HOME")
 repo='https://git.gmoker.com/ange/dotfiles.git'