summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-02-28 14:58:09 +0100
committerAlan Pearce2017-02-28 14:58:09 +0100
commit49a5ac56ccf6bea186dcf0bfccb32bb82b05a772 (patch)
tree9b432f3610b1e3f4e9d0f9064d1a5816cf44345c
parent21d5403fe6d5d0c6d51cda1d6080a62496e9b243 (diff)
downloadnixfiles-49a5ac56ccf6bea186dcf0bfccb32bb82b05a772.tar.lz
nixfiles-49a5ac56ccf6bea186dcf0bfccb32bb82b05a772.tar.zst
nixfiles-49a5ac56ccf6bea186dcf0bfccb32bb82b05a772.zip
Fix setting SSH_AUTH_SOCK
-rw-r--r--tag-emacs/emacs.d/init.org2
-rw-r--r--tag-zsh/config/zsh/zshenv2
2 files changed, 2 insertions, 2 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 916bb61f..d019e16d 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -677,7 +677,7 @@ that I can sudo on remote machines
   :defer 7
   :config (progn
             (unless (getenv "SSH_AUTH_SOCK")
-              (setenv "SSH_AUTH_SOCK" "/run/user/1000/ssh-agent.socket"))
+              (setenv "SSH_AUTH_SOCK" (format "/run/user/%s/ssh-agent" (user-uid))))
             (setq tramp-default-method "ssh"
                   tramp-default-user-alist '(("\\`su\\(do\\)?\\'" nil "root"))
                   tramp-backup-directory-alist backup-directory-alist
diff --git a/tag-zsh/config/zsh/zshenv b/tag-zsh/config/zsh/zshenv
index e75704ca..f1cad02f 100644
--- a/tag-zsh/config/zsh/zshenv
+++ b/tag-zsh/config/zsh/zshenv
@@ -14,7 +14,7 @@ then
 
   if [[ -z $SSH_AUTH_SOCK ]]
   then
-    export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
+    export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR:-/run/user/$UID}/ssh-agent
   fi
 
   case $OSTYPE in