Updates from alpine

1 files changed, 34 insertions, 2 deletions

diff --git a/scripts/setup-config-alpine b/scripts/setup-config-alpine
index a9a63b9..9db2c35 100755
--- a/scripts/setup-config-alpine
+++ b/scripts/setup-config-alpine
@@ -42,11 +42,33 @@ for i in dmenu dwm st; do
         cd $i
         cp ~/.config/$i/config.h ./config.h
         make && doas make install
+        cd ..
 done
 cd
 
+tmp_xorg_file=$(mktemp)
+cat <<EOF > $tmp_xorg_file
+Section "InputClass"
+        Identifier "libinput touchpad catchall"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+        Driver "libinput"
+        Option "Tapping" "on"
+EndSection
+EOF
+
+doas mkdir -p /etc/X11/xorg.conf.d
+doas mv $tmp_xorg_file /etc/X11/xorg.conf.d/40-libinput.conf
+
+tmp_doas_file=$(mktemp)
+cp /etc/doas.d/20-wheel.conf $tmp_doas_file
+for c in poweroff reboot; do
+        printf 'permit nopass :wheel as root cmd %s\n' "$c" >> $tmp_doas_file
+done
+doas cp $tmp_doas_file /etc/doas.d/20-wheel.conf
+
 
-print_log "Swapping Escape and Caps Lock in console"
+print_log "Configuring the console"
 
 tmp_kmap_file=$(mktemp)
 tmp_loadkmap_file=$(mktemp)
@@ -58,11 +80,18 @@ doas mv us-swapesc.bmap.gz /etc/keymap/
 printf 'KEYMAP=/etc/keymap/us-swapesc.bmap.gz\n' > $tmp_loadkmap_file
 doas mv $tmp_loadkmap_file /etc/conf.d/loadkmap
 
+tmp_blacklist_file=$(mktemp)
+cp /etc/modprobe.d/blacklist.conf $tmp_blacklist_file
+printf '\n# Disable PC speaker for real\nblacklist pcspkr\n' >> $tmp_blacklist_file
+doas cp $tmp_blacklist_file /etc/modprobe.d/blacklist.conf
+
 
 print_log "Setting up ACPI (see https://wiki.alpinelinux.org/wiki/Power_management)"
 
 tmp_acpi_file=$(mktemp)
 cat <<EOF > $tmp_acpi_file
+#!/bin/sh
+
 xhci="$(grep XHCI /proc/acpi/wakeup | awk '{print $3}')"
 [ "$xhci" == '*enabled' ] && echo XHCI > /proc/acpi/wakeup
 echo mem > /sys/power/state
@@ -74,6 +103,8 @@ for dir in LID PWRF; do
         doas chmod +x /etc/acpi/$dir/00000080
 done
 
+doas rc-update add acpid
+
 
 print_log "Setting up WiFi (iwd) (see https://wiki.alpinelinux.org/wiki/Iwd)"
 
@@ -130,6 +161,7 @@ echo "      1c. github"
 echo "   3. Share folders in SyncThing, including but not limited to:"
 echo "      2a. box with Artemisia, pizoc and phone"
 echo "      2b. file-drop with phone"
-echo "   4. Copy your mailbox.org password to .ssh/mailbox.org"
+echo "   4. Copy your mailbox.org password to .ssh/mailbox.org."
+echo "   5. Log into Firefox account and set up extensions, if needed."
 echo ""
 echo "Enjoy!"