From 4c7303d69918d8e219408e7c49563a5306f619d7 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 21 Jul 2016 02:04:45 +0200
Subject: [PATCH] m 2 zsh-user: use gpg-agent 2.1 style daemon
---
2configs/zsh-user.nix | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/2configs/zsh-user.nix b/2configs/zsh-user.nix
index 9527ead..99c1315 100644
--- a/2configs/zsh-user.nix
+++ b/2configs/zsh-user.nix
@@ -22,15 +22,11 @@ in
bindkey "\e[3~" delete-char
zstyle ':completion:*' menu select
- # load gpg-agent
- envfile="$HOME/.gnupg/gpg-agent.env"
- if [ -e "$envfile" ] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then
- eval "$(cat "$envfile")"
- else
- eval "$(${pkgs.gnupg}/bin/gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")"
- fi
- export GPG_AGENT_INFO
- export SSH_AUTH_SOCK
+ gpg-connect-agent updatestartuptty /bye >/dev/null
+ GPG_TTY=$(tty)
+ export GPG_TTY
+ unset SSH_AGENT_PID
+ export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
'';
promptInit = ''