diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-16 03:08:41 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-16 03:08:41 -0400 |
| commit | 76aeffa26d11219d2c9cb7b0889ac21a1fefa9e2 (patch) | |
| tree | a444997094bfd3240e80d46f079e8d505c9c3c3f | |
| parent | 7a9061278ed7033a9dc676f18029423824d91db4 (diff) | |
do away with ~/.sessions
| -rw-r--r-- | .config/login.sh | 11 | ||||
| -rw-r--r-- | .config/ssh/config | 2 | ||||
| -rw-r--r-- | .config/systemd/user/default.target.wants/gpg-agent.service | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/.config/login.sh b/.config/login.sh index 3c29c99..c28ca17 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -28,8 +28,7 @@ export TMPDIR="$HOME/tmp" # XDG ################################################################ . "$HOME/.local/lib/xdg.sh" -mkdir -p -- "$XDG_RUNTIME_DIR/sessions" -ln -sfT -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions +ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime # Settings ########################################################### @@ -52,10 +51,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 ~/.sessions/gpg ]]; then +if [[ -f ~/.runtime/gpg ]]; then echo 'login: Setting gpg-agent info:' - cat ~/.sessions/gpg - . ~/.sessions/gpg + cat ~/.runtime/gpg + . ~/.runtime/gpg export GPG_AGENT_INFO #export SSH_AUTH_SOCK fi @@ -73,7 +72,7 @@ export _JAVA_OPTIONS # X11 if [[ -z $XAUTHORITY ]]; then #export XAUTHORITY="$HOME/.Xauthority" - export XAUTHORITY=$HOME/.sessions/Xauthority + export XAUTHORITY=$HOME/.runtime/Xauthority fi # D-Bus diff --git a/.config/ssh/config b/.config/ssh/config index b6e53d6..9b366ed 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -1,7 +1,7 @@ Host * Protocol 2 ControlMaster auto - ControlPath ~/.sessions/ssh-%r@%h:%p + ControlPath ~/.runtime/ssh-%r@%h:%p Compression yes Host lore diff --git a/.config/systemd/user/default.target.wants/gpg-agent.service b/.config/systemd/user/default.target.wants/gpg-agent.service index a9de9b2..93c12b0 100644 --- a/.config/systemd/user/default.target.wants/gpg-agent.service +++ b/.config/systemd/user/default.target.wants/gpg-agent.service @@ -3,7 +3,7 @@ Description="GnuPG agent daemon" [Service] Type=forking -ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${HOME}/.sessions/gpg +ExecStart=/usr/bin/gpg-agent --daemon --write-env-file ${XDG_RUNTIME_DIR}/gpg [Install] WantedBy=default.target |