# HG changeset patch # User Meredith Howard # Date 1492630067 14400 # Node ID cd5b3906e68714de089de1c5b62177eeae73611f # Parent f8c29fb56a9171e1235402a4a6df3610bd0660f3 add fallbacks for when make isn't around yet diff --git a/.profile.common b/.profile.common --- 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 diff --git a/.xsessionrc b/.xsessionrc --- 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