Updated scripts for Qubes 4.1

2 files changed, 24 insertions, 22 deletions

diff --git a/qubes-dwm-6.2/autostart/autostart.sh b/qubes-dwm-6.2/autostart/autostart.sh
index b629929..bbf830f 100755
--- a/qubes-dwm-6.2/autostart/autostart.sh
+++ b/qubes-dwm-6.2/autostart/autostart.sh
@@ -10,7 +10,19 @@ xset -dpms
 echo "enable autolock" > ~/.autolock_status
 toggle_autolock
 
-# Set my wallpaper
-feh --bg-scale /usr/share/backgrounds/tiles/default_blue.jpg
+# Monitor battery
+battery_monitor &
+
+# Automatic colour temperature adjustment for Baltimore
+redshift -l +39:-76 &
+
+# Compositor
+picom &
+
+# Monitor configuration
+srandrd display_handler
+if [ -n "$(xrandr | grep 'HDMI-1 connected')" ]; then
+  SRANDRD_OUTPUT=HDMI-1 SRANDRD_EVENT=connected display_handler
+fi;
 
 exec dwm_status &
diff --git a/qubes-dwm-6.2/autostart/autostart_blocking.sh b/qubes-dwm-6.2/autostart/autostart_blocking.sh
index 903f27e..4e0f569 100755
--- a/qubes-dwm-6.2/autostart/autostart_blocking.sh
+++ b/qubes-dwm-6.2/autostart/autostart_blocking.sh
@@ -1,28 +1,18 @@
 #!/bin/sh
 
-if [ -n "$(qvm-usb | grep tslil_clingman_dactyl_manuform_mini_0)" ]; then
-	# If my USB keyboard is detected, don't mangle the layout
-	setxkbmap -layout us -variant altgr-intl -option caps:ctrl_modifier,terminate:ctrl_alt_bksp,nodeadkeys
+xdg_autostart
+
+# if [ -n "$(qvm-usb | grep tslil_clingman)" ]; then
+if [ -n "$(qvm-usb | grep Technomancy_Atreus)" ]; then
+  setxkbmap -layout us -variant altgr-intl -option caps:ctrl_modifier,terminate:ctrl_alt_bksp,nodeadkeys
 else
-	# Otherwise set the layout for the built-in keyboard
-	setxkbmap -model pc104curl-z -layout us -variant cmk_ed_dh -option caps:ctrl_modifier,terminate:ctrl_alt_bksp
+  notify-send "Setting layout for internal keyboard"
+  # Qubes only presents one device to each domU, so this doesn't work as expected
+  internal_keyboard=$(xinput -list | grep 'AT Raw' | sed 's/^.*id=\([0-9]*\).*$/\1/')
+  setxkbmap -model pc105aw-sl -layout 'us(cmk_ed_dh)' -option caps:ctrl_modifier,terminate:ctrl_alt_bksp
 fi
-# In a better world we could use something like
-# internal_keyboard=$(xinput -list | grep 'AT Translated' | sed 's/^.*id=\([0-9]*\).*$/\1/')
-# setxkbmap -device $internal_keyboard ...
-# but Qubes only sends one input source to each domU so this wont work.
 
-# I used to have a slightly-too-large Coreboot image in the EEPROM and it
-# would occassionaly cause the RAM to fail. This is fixed, but i might as
-# well keep the following around.
 if [ "$(xl info | awk '/total_memory/ { print $3 }')" -lt "16148" ]; then
-	notify-send -u critical "RAM malfunction"
+  notify-send -u critical "RAM malfunction"
 fi;
 
-# FHD mod! Thanks nitrocaster for your hard work, and the coreboot community
-# for the patch that disconnects the internal LVDS.
-if [ -n "$(xrandr | grep 'VGA1 connected')" ]; then
-	xrandr --output eDP --auto --output VGA1 --left-of eDP --auto
-fi
-
-exec xdg_autostart