diff options
| -rw-r--r-- | bash/.profile | 5 | ||||
| -rw-r--r-- | wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh | 3 | ||||
| -rw-r--r-- | zsh/.zshenv | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/bash/.profile b/bash/.profile index 33b9553..75629f5 100644 --- a/bash/.profile +++ b/bash/.profile @@ -8,6 +8,11 @@ export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/"$UID"} export ZDOTDIR="$XDG_CONFIG_HOME"/zsh export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME"/bash-completion/completions +# GPG/SSH +export GPG_TTY="$(tty)" +export GPG_AGENT_SOCK=$(gpgconf --list-dirs agent-socket) +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + # Misc export EDITOR="$( command -v nvim 2>/dev/null || command -v vim 2>/dev/null || command -v vi )" export BROWSER="firefox" diff --git a/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh b/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh index 58f5cd9..c229ad2 100644 --- a/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh +++ b/wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh @@ -11,9 +11,6 @@ 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' diff --git a/zsh/.zshenv b/zsh/.zshenv index 33b9553..75629f5 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -8,6 +8,11 @@ export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/"$UID"} export ZDOTDIR="$XDG_CONFIG_HOME"/zsh export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME"/bash-completion/completions +# GPG/SSH +export GPG_TTY="$(tty)" +export GPG_AGENT_SOCK=$(gpgconf --list-dirs agent-socket) +export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) + # Misc export EDITOR="$( command -v nvim 2>/dev/null || command -v vim 2>/dev/null || command -v vi )" export BROWSER="firefox" |