DELETED fish/functions/gpg-sftp.fish
Index: fish/functions/gpg-sftp.fish
==================================================================
--- fish/functions/gpg-sftp.fish
+++ fish/functions/gpg-sftp.fish
@@ -1,4 +0,0 @@
-function gpg-sftp --wraps sftp
-    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
-    sftp $argv
-end

DELETED fish/functions/gpg-ssh-add.fish
Index: fish/functions/gpg-ssh-add.fish
==================================================================
--- fish/functions/gpg-ssh-add.fish
+++ fish/functions/gpg-ssh-add.fish
@@ -1,4 +0,0 @@
-function gpg-ssh-add --wraps ssh-add
-    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
-    ssh-add $argv
-end

DELETED fish/functions/gpg-ssh.fish
Index: fish/functions/gpg-ssh.fish
==================================================================
--- fish/functions/gpg-ssh.fish
+++ fish/functions/gpg-ssh.fish
@@ -1,4 +0,0 @@
-function gpg-ssh --wraps ssh
-    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
-    ssh $argv
-end

ADDED   fish/functions/gsftp.fish
Index: fish/functions/gsftp.fish
==================================================================
--- fish/functions/gsftp.fish
+++ fish/functions/gsftp.fish
@@ -0,0 +1,4 @@
+function gsftp --wraps sftp
+    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
+    sftp $argv
+end

ADDED   fish/functions/gssh-add.fish
Index: fish/functions/gssh-add.fish
==================================================================
--- fish/functions/gssh-add.fish
+++ fish/functions/gssh-add.fish
@@ -0,0 +1,4 @@
+function gssh-add --wraps ssh-add
+    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
+    ssh-add $argv
+end

ADDED   fish/functions/gssh.fish
Index: fish/functions/gssh.fish
==================================================================
--- fish/functions/gssh.fish
+++ fish/functions/gssh.fish
@@ -0,0 +1,4 @@
+function gssh --wraps ssh
+    set -lx SSH_AUTH_SOCK $GNUPGHOME/S.gpg-agent.ssh
+    ssh $argv
+end

Index: zshrc
==================================================================
--- zshrc
+++ zshrc
@@ -329,13 +329,13 @@
 
 # mpv does not like locales that use , as decimal point.
 __has_command mpv && alias mpv="LC_ALL=C mpv"
 
 if __has_command gpg gpg2; then
-	alias gpg-ssh="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh ssh"
-	alias gpg-ssh-add="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh ssh-add"
-	alias gpg-sftp="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh sftp"
+	alias gssh="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh ssh"
+	alias gssh-add="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh ssh-add"
+	alias gsftp="SSH_AUTH_SOCK=$GNUPGHOME/S.gpg-agent.ssh sftp"
 fi
 
 if __has_command cryptopassphrase; then
 	pwnk() {
 		local clipboard