From 70fa9a5b60a92c75b0a580b385f3a85b43282719 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Fri, 1 Apr 2022 19:47:43 -0500 Subject: fix: make gpg work again on wsl --- wsl/.gnupg/gpg-agent.conf | 2 ++ wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 wsl/.gnupg/gpg-agent.conf (limited to 'wsl') diff --git a/wsl/.gnupg/gpg-agent.conf b/wsl/.gnupg/gpg-agent.conf new file mode 100644 index 0000000..52034d5 --- /dev/null +++ b/wsl/.gnupg/gpg-agent.conf @@ -0,0 +1,2 @@ +enable-ssh-support +enable-putty-support \ No newline at end of file diff --git a/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh b/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh index c229ad2..8f88e48 100644 --- a/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh +++ b/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh @@ -11,6 +11,9 @@ export DISPLAY=$(grep -m 1 nameserver /etc/resolv.conf | awk '{print $2}'):0 export VISUAL="code --wait" export BROWSER=wslview export XDG_RUNTIME_DIR=/tmp/xdg +export SSH_AUTH_SOCK="$HOME/.ssh/agent.sock" +export GPG_AGENT_SOCK="$HOME/.gnupg/S.gpg-agent" +export GPG_TTY="$(tty)" alias wsl=wsl.exe alias ykman='/mnt/c/Program\ Files/Yubico/YubiKey\ Manager/ykman.exe' @@ -55,6 +58,8 @@ scoop() { wsl_cmd_proxy "scoop" "$@"; } alacritty() { wsl_cmd_proxy "alacritty.exe" "$@"; } gpg-init() ( + echo "$SSH_AUTH_SOCK" + echo "$GPG_AGENT_SOCK" if ! ss -a | grep -q "$SSH_AUTH_SOCK"; then rm -f "$SSH_AUTH_SOCK" wsl2_ssh_pageant_bin="$HOME/.ssh/wsl2-ssh-pageant.exe" -- cgit v1.2.3-70-g09d2