diff --git a/fish/functions/gsftp.fish b/fish/functions/gsftp.fish index 590b77f..c6cb07d 100644 --- a/fish/functions/gsftp.fish +++ b/fish/functions/gsftp.fish @@ -1,4 +1,4 @@ function gsftp --wraps sftp set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh - sftp $argv + sftp -o IdentitiesOnly=no $argv end diff --git a/fish/functions/gssh.fish b/fish/functions/gssh.fish index f0f88b2..3c8fda6 100644 --- a/fish/functions/gssh.fish +++ b/fish/functions/gssh.fish @@ -1,4 +1,4 @@ function gssh --wraps ssh set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh - ssh $argv + ssh -o IdentitiesOnly=no $argv end diff --git a/ssh_config b/ssh_config index 21e5011..e55feaf 100644 --- a/ssh_config +++ b/ssh_config @@ -16,6 +16,7 @@ Host wip.pkgsrc.org Ciphers aes256-gcm@openssh.com Host * + IdentitiesOnly yes Ciphers chacha20-poly1305@openssh.com KexAlgorithms curve25519-sha256@libssh.org HostKeyAlgorithms ssh-ed25519 diff --git a/zshrc b/zshrc index 82c3442..d9d348b 100644 --- a/zshrc +++ b/zshrc @@ -376,9 +376,9 @@ if __has_command gpg gpg2; then fi [ -n "$sock" ] || sock="$GNUPGHOME/S.gpg-agent.ssh" - alias gssh="SSH_AUTH_SOCK=$sock ssh" + alias gssh="SSH_AUTH_SOCK=$sock ssh -o IdentitiesOnly=no" alias gssh-add="SSH_AUTH_SOCK=$sock ssh-add" - alias gsftp="SSH_AUTH_SOCK=$sock sftp" + alias gsftp="SSH_AUTH_SOCK=$sock sftp -o IdentitiesOnly=no" fi if __has_command cryptopassphrase; then