Mercurial > hg > mhoward > dotfiles / changeset

--- a/.profile.common
+++ b/.profile.common
@@ -2,7 +2,8 @@
 
 umask 027
 
-make -s -C ~/.ssh
+make -s -C ~/.ssh || \
+  cat .ssh/config.d/* > .ssh/config
 
 export EDITOR=vim
 export SUDO_EDITOR=$HOME/bin/privim

--- a/.xsessionrc
+++ b/.xsessionrc
@@ -20,7 +20,8 @@ fi
 
 urxvtd -q -o -f
 
-make -s -C ~/.i3
+make -s -C ~/.i3 || \
+  { cat .i3/config.d/* > .i3/config && cat .i3/status.d/* > .i3/status }
 
 if [ -r ~/.xsessionrc.local ]; then
   . ~/.xsessionrc.local