tons of changes from when website was down

2 files changed, 7 insertions, 13 deletions

diff --git a/x11/xkeyconf b/x11/xkeyconf
index cea356f..bc310b6 100755
--- a/x11/xkeyconf
+++ b/x11/xkeyconf
@@ -1,12 +1,5 @@
 #!/bin/sh
-# Faster repeated keys and less delay before repeating
-xset r rate 250 50 &
-
-# Remap caps to super when held
-setxkbmap -option caps:super
-
-# Remap caps to escape when pressed
-killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape'
-
-# Turn off caps lock, just in case it was on prior
-xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock
+xset r rate 250 50 & # Faster repeated keys and less delay before repeating
+setxkbmap -option caps:super # Remap caps to super when held
+killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape' # Remap caps to escape when pressed
+xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock # Turn off caps lock, just in case it was on prior
diff --git a/x11/xsudo b/x11/xsudo
index 5feabb1..db4a82a 100755
--- a/x11/xsudo
+++ b/x11/xsudo
@@ -1,7 +1,8 @@
 #!/bin/sh
-sudo=doas
+sudo=${SUDO:-sudo}
 while ! echo "$pass" | $sudo -n true; do
 	pass="$(dmenu -p 'Password: ' <&-)" # Ask user for password pass is incorrect (skipped if nopass in enabled)
 	[ "$pass" = '' ] && exit 0
 done
-echo "$pass" | $sudo xauth -f /root/.Xauthority add $(xauth list $DISPLAY) && echo "$pass" | $sudo "$@"
+echo "$pass" | $sudo xauth -f /root/.Xauthority add $(xauth list $DISPLAY) \
+	&& echo "$pass" | $sudo "$@"