diff options
author | Toby Vincent <tobyv13@gmail.com> | 2022-03-29 14:11:59 -0500 |
---|---|---|
committer | Toby Vincent <tobyv13@gmail.com> | 2022-03-29 14:11:59 -0500 |
commit | 9770190e54128f1e24d69a1e42a013bb408c68f9 (patch) | |
tree | e0346bbf74edd901f71ce12236edfde17c8e5ac8 | |
parent | 846bbdc473ad91218dfa08b384bb817681446721 (diff) |
fix: moved GPG_TTY to wsl plugin
-rw-r--r-- | wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh | 6 | ||||
-rw-r--r-- | zsh/.zshenv | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh b/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh index 92b7e5b..b692551 100644 --- a/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh +++ b/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh @@ -13,6 +13,7 @@ export DISPLAY=$(grep -m 1 nameserver /etc/resolv.conf | awk '{print $2}'):0 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' @@ -91,7 +92,7 @@ gpg-init() ( fi ) -start-pageant() { +_start-pageant() { # TODO: WIP if ! ss -a | grep -q "${GPG_AGENT_SOCK}.extra"; then rm -rf "${GPG_AGENT_SOCK}.extra" @@ -120,5 +121,4 @@ gpg-learn() { gpg-init -# https://github.com/validatedev/drop-cache-if-idle -[ -z "$(ps -ef | grep cron | grep -v grep)" ] && sudo /etc/init.d/cron start &>/dev/null +unset -f _start-pageant
\ No newline at end of file diff --git a/zsh/.zshenv b/zsh/.zshenv index 281033c..b66b1f9 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -14,7 +14,6 @@ export VISUAL="code --wait" export MANPAGER="sh -c 'col -bx | bat -l man -p'" export MANROFFOPT="-c" export GOPATH="$HOME"/.go -export GPG_TTY=$( tty ) export STARSHIP_LOG="error" export FZF_PREVIEW_COMMAND="bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}" export FZF_DEFAULT_COMMAND="fd --type f || git ls-tree -r --name-only HEAD || rg --files || find ." |