diff options
| -rw-r--r-- | .config/login.sh | 12 | ||||
| -rw-r--r-- | .config/ssh/config | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.config/login.sh b/.config/login.sh index c43a4a0..09c768a 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -44,8 +44,8 @@ fi # XDG ################################################################ . "$HOME/.local/lib/xdg.sh" -ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime - +mkdir -p -- "$HOME/.runtime" +ln -sfT -- "$XDG_RUNTIME_DIR" "$HOME/.runtime/$HOSTNAME" # Box-specific stuff ################################################# @@ -74,10 +74,10 @@ if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then echo 'login: Setting GPGKEY' export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` fi -if [[ -f ~/.runtime/gpg ]]; then +if [[ -f $XDG_RUNTIME_DIR/gpg ]]; then echo 'login: Setting gpg-agent info:' - cat ~/.runtime/gpg - . ~/.runtime/gpg + cat "$XDG_RUNTIME_DIR/gpg" + . "$XDG_RUNTIME_DIR/gpg" export GPG_AGENT_INFO #export SSH_AUTH_SOCK fi @@ -95,5 +95,5 @@ export _JAVA_OPTIONS # X11 if [[ -z $XAUTHORITY ]]; then export XAUTHORITY="$HOME/.Xauthority" - #export XAUTHORITY=$HOME/.runtime/Xauthority + #export XAUTHORITY=$XDG_RUNTIME_DIR/Xauthority fi diff --git a/.config/ssh/config b/.config/ssh/config index 9b366ed..d60058f 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -1,7 +1,7 @@ Host * Protocol 2 ControlMaster auto - ControlPath ~/.runtime/ssh-%r@%h:%p + ControlPath ~/.runtime/%l/ssh-%r@%h:%p Compression yes Host lore |