diff options
| author | Aaron LI <aly@aaronly.me> | 2018-02-20 21:15:46 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-02-20 21:15:46 +0800 |
| commit | 3f80c4abe8f866d6ed730518af2289a51b5097a5 (patch) | |
| tree | 358c14ab5050004c46d47c892c8ad282900df51a | |
| parent | 607ca8f9a2252f9d93e9ce1b6af792ac75d3951c (diff) | |
| download | dotfiles-3f80c4abe8f866d6ed730518af2289a51b5097a5.tar.bz2 | |
zsh/gpg: simplify gpg-agent launch on login; add note about systemd
| -rw-r--r-- | _zlogin | 3 | ||||
| -rw-r--r-- | _zsh/80-gpg.zsh | 7 |
2 files changed, 7 insertions, 3 deletions
@@ -14,8 +14,7 @@ ## Start `gpg-agent' on login (non-SSH connections) GPG_AGENT_SOCKET="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent" if [[ -z ${SSH_CONNECTION} ]] && [[ ! -S "${GPG_AGENT_SOCKET}" ]]; then - gpg-agent --daemon --enable-ssh-support \ - --pinentry-program ${HOME}/bin/pinentry >/dev/null 2>&1 + restart-gpg-agent fi ## Auto start X if login on tty6 diff --git a/_zsh/80-gpg.zsh b/_zsh/80-gpg.zsh index c0314d4..ef1f153 100644 --- a/_zsh/80-gpg.zsh +++ b/_zsh/80-gpg.zsh @@ -2,7 +2,12 @@ # zsh/gpg.zsh # -# NOTE: `gpg-agent' is configured to be launched in `~/.profile'. +# NOTE: +# ZSH is configured to launch `gpg-agent' on login, so it may be necessary +# to disable its launch by systemd, e.g., +# $ systemctl --global --user mask --now \ +# gpg-agent.service gpg-agent.socket gpg-agent-ssh.socket \ +# gpg-agent-extra.socket gpg-agent-browser.socket # This `GPG_TTY' variable should be set to the correct TTY where the shell # is running. See `gpg-agent(1)' for more details. |