X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=dwmrc;h=3bcf522294c1401745e1d15337c9339a5b109318;hb=1e5ec194036a4b7d3f32ac7f9d41a15e52cb12fe;hp=c2a2a1cdb27691e615f03cea937434a7729d5732;hpb=fe92fc6177b902fa97a6db36327680438c4ea190;p=smckown%2Fdotfiles.git

diff --git a/dwmrc b/dwmrc
index c2a2a1c..3bcf522 100755
--- a/dwmrc
+++ b/dwmrc
@@ -1,15 +1,16 @@
 #!/bin/bash
 #
-# Probably called from a /usr/share/xsessions/somesession.desktop that lists an
-# exec like dwm.custom, and the dwm.custom executable script looks like:
-#
-# #!/bin/bash
-#
-# if [ -f "$HOME/.dwmrc" ]; then
-#     exec "$HOME/.dwmrc"
-# else
-#     exec dwm.custom
-# fi
+# Startup on my Ubuntu 14.04 system works like this:
+# - lightdm finds /usr/share/xsessions/dwm.desktop
+# - This desktop file launches dwm.user, which is found in /usr/bin
+# - /usr/bin/dwm.user is a script that execs $HOME/.dwmrc, if present, else it
+#   execs dwm.
+# - This is my dwmrc, which installs as ~/.dwmrc
+
+# Although the system startup merged ~/.Xresources, it did so with the -nocpp
+# option (Ubuntu 14.04), which prevents the use of #define, etc.  Re-merge here
+# for correct behavior.
+xrdb -merge ~/.Xresources
 
 # Initial startup volume to sane level
 pactl set-sink-volume $(pactl info | grep "Default Sink:" | awk '{ print $3}') '30%'
@@ -36,4 +37,11 @@ pgrep -x xfce4-power-manager || xfce4-power-manager &
 pgrep -x pidgin || pidgin &
 pgrep dwm-i3status || dwm-i3status &
 
+# Get ssh-add out of the way.  The ssh-askpass-fullscreen pkg provides a bit
+# nicer ssh-askpass than the default X11 version.
+SSH_ASKPASS=/usr/bin/ssh-askpass ssh-add &
+
+# DWM has bindings for screen captures that expects ~/screenshots/ to exist.
+mkdir -p ~/screenshots
+
 exec dwm.custom