dwmrc: ssh-add

[smckown/dotfiles.git] / dwmrc

diff --git a/dwmrc b/dwmrc
index c2a2a1cdb27691e615f03cea937434a7729d5732..0b74a861508f6b84442ec268afc99da733c7cb83 100755 (executable)
--- a/dwmrc
+++ b/dwmrc
@@ -11,6 +11,11 @@
 #     exec dwm.custom
 # fi
 
+# 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 +41,8 @@ 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 &
+
 exec dwm.custom