X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=dwmrc;h=92a4448a7c5783b6d5ec8b427a319879cfe1b2ce;hb=HEAD;hp=88a3491cf79625491984bfb97252d38f8d4c4757;hpb=a9778e26b33280f1a8f5ed9a32cf996eed707c7f;p=smckown%2Fdotfiles.git

diff --git a/dwmrc b/dwmrc
index 88a3491..92a4448 100755
--- a/dwmrc
+++ b/dwmrc
@@ -25,22 +25,33 @@ xsetroot -solid black
 dispcfg
 
 # Screen saver.  DPMS standby -> suspend -> off in seconds
-# xss-lock calls i3lock on no X activity (DPMS standby)
 xset dpms 300 600 1200
-pgrep -x xss-lock || xss-lock -- i3lock --dpms &
+
+# Use xss-lock to call a program on no X activity (DPMS standby)
+if [ -x ~/.Xidle ]; then
+    # If provided, .Xidle can do stuff before and after a call to 'i3lock -n'
+    (pgrep -x xss-lock || exec xss-lock -- ~/.Xidle ) &
+elif [ -x /usr/bin/i3lock ]; then
+    # Fall back to i3lock, which provides a screen lock.
+    # Instead of --dpms use --color.  This is less confusing on monitors that
+    # are slow to sync back up.  And since X should generally have the monitor
+    # suspended by this point anyway, the behavior should only change in the
+    # case of things like an invalid password being entered.
+    (pgrep -x xss-lock || exec xss-lock -- i3lock --color=000000 ) &
+fi
 
 # Turn off touchpad (later use a toggle)
 type synclient 2>/dev/null && synclient TouchpadOff=1
 
 # Applets, etc
-pgrep -x xbindkeys || xbindkeys &
-pgrep -x dunst || dunst &
-pgrep -x nm-applet || nm-applet &
-pgrep -x xfce4-power-manager || xfce4-power-manager &
-pgrep -x pidgin || pidgin &
-pgrep dwm-i3status || dwm-i3status &
+(pgrep -x xbindkeys || exec xbindkeys ) &
+(pgrep -x dunst || exec dunst ) &
+(pgrep -x nm-applet || exec nm-applet ) &
+(pgrep -x xfce4-power-manager || exec xfce4-power-manager ) &
+(pgrep dwm-i3status || exec dwm-i3status ) &
+(exec xterm -e mcabber ) &
 
 # DWM has bindings for screen captures that expects ~/screenshots/ to exist.
 mkdir -p ~/screenshots
 
-exec dwm.custom
+exec dwm-custom