Index: fish/config.fish
==================================================================
--- fish/config.fish
+++ fish/config.fish
@@ -37,10 +37,13 @@
 set -x LS_COLORS 'di=34:ow=44;37:tw=44;37:st=44;37:ex=31:su=7;31:sg=7;31:ln=33:or=7;33:pi=32:do=32:bd=35:cd=35:so=32:*.bz2=36:*.dmg=36:*.gz=36:*.gpg=36:*.rar=36:*.tar=36:*.tbz2=36:*.tgz=36:*.xz=36:*.zip=36:*.orig=90:*~=90'
 set -x SUDO_PROMPT (printf "\033[0;31m[\033[1;31msudo -> %%U\033[0;31m]\033[0m Password for \033[1m%%p@%%H\033[0m: ")
 set -x GNUPGHOME "$XDG_DATA_HOME/gnupg"
 set -x CVS_RSH ssh
 
+if type -q gpg2
+    alias gpg=gpg2
+end
 if type -q gpg
     # Make sure the GPG agent is running
     gpg --card-status &>/dev/null
 
     set -l sock

DELETED fish/functions/gpg.fish
Index: fish/functions/gpg.fish
==================================================================
--- fish/functions/gpg.fish
+++ fish/functions/gpg.fish
@@ -1,3 +0,0 @@
-function gpg --wraps=gpg2
-    command gpg2 $argv
-end