all repos — nixfiles @ 82485764d3001c5759bb2e56a4e2779633dcc644

System and user configuration, managed by nix and home-manager

zsh: Don't configure GPG SSH agent on osx

Alan Pearce
commit

82485764d3001c5759bb2e56a4e2779633dcc644

parent

51784ea0031ab238e3c9fa6c5e18c12e2ee56225

1 file changed, 9 insertions(+), 6 deletions(-)

jump to
M zsh/.config/zsh/.zshenvzsh/.config/zsh/.zshenv
@@ -10,12 +10,6 @@ then
. $ZDOTDIR/zshenv.private fi - unset SSH_AGENT_PID - if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]] - then - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" - fi - if [[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] then . $HOME/.nix-profile/etc/profile.d/nix.sh;
@@ -44,6 +38,15 @@ if [[ $osrelease =~ Microsoft$ ]]
then export windows=1 umask 002 + fi + fi + + if [[ $os != "darwin" ]] + then + unset SSH_AGENT_PID + if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]] + then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi fi