diff options
| -rw-r--r-- | bash/.profile | 5 | ||||
| -rw-r--r-- | wsl/.gnupg/gpg-agent.conf | 2 | ||||
| -rw-r--r-- | wsl/.local/share/zsh-wsl/zsh-wsl.plugin.zsh | 5 | ||||
| -rw-r--r-- | zsh/.config/zsh/.zlogin | 12 | ||||
| -rw-r--r-- | zsh/.zshenv | 5 |
5 files changed, 11 insertions, 18 deletions
diff --git a/bash/.profile b/bash/.profile index 0256cba..2b0f9c7 100644 --- a/bash/.profile +++ b/bash/.profile @@ -8,11 +8,6 @@ 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/.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" diff --git a/zsh/.config/zsh/.zlogin b/zsh/.config/zsh/.zlogin index 1e45b44..3511c72 100644 --- a/zsh/.config/zsh/.zlogin +++ b/zsh/.config/zsh/.zlogin @@ -1,9 +1,5 @@ -export DISPLAY=':0' -export WAYLAND_DISPLAY=0 -export XDG_SESSION_TYPE=wayland -systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_SESSION_TYPE - -if command -v dbus-update-activation-environment >/dev/null 2>&1; then - dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY XDG_SESSION_TYPE -fi
\ No newline at end of file +# 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)
\ No newline at end of file diff --git a/zsh/.zshenv b/zsh/.zshenv index 0256cba..2b0f9c7 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -8,11 +8,6 @@ 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" |