diff --git a/.config/fish/conf.d/abbrevs.fish b/.config/fish/conf.d/abbrevs.fish
new file mode 100644
index 0000000..e6cb400
--- /dev/null
+++ b/.config/fish/conf.d/abbrevs.fish
@@ -0,0 +1,52 @@
+abbr -a mv 'mv -i'
+
+abbr -a grep 'grep --color=auto'
+abbr -a fgrep 'fgrep --color=auto'
+abbr -a egrep 'egrep --color=auto'
+
+abbr -a ga 'git add'
+abbr -a gb 'git branch'
+abbr -a gc 'git commit'
+abbr -a gca 'git commit --amend'
+abbr -a gcm 'git commit -m'
+abbr -a gco 'git checkout'
+abbr -a gd 'git diff'
+abbr -a glo 'git log'
+abbr -a glp 'git log -p'
+abbr -a gp 'git push'
+abbr -a gpu 'git pull'
+abbr -a gri 'git rebase --interactive'
+abbr -a gs 'git status -sb'
+
+abbr -a la 'ls -a'
+abbr -a ll 'ls -l'
+
+# prefer exa instead of ls if available
+if type -q exa
+    abbr -a ls exa
+    abbr -a ee 'exa -alF'
+    abbr -a ll 'exa -alF'
+    abbr -a ea 'exa -a'
+    abbr -a la 'exa -a'
+end
+
+# prefer eza instead of ls/exa if available
+if type -q eza
+    abbr -a ls eza
+    abbr -a ee 'eza -alF'
+    abbr -a ll 'eza -alF'
+    abbr -a ea 'eza -a'
+    abbr -a la 'eza -a'
+end
+
+# use running Emacs if available
+if type -q emacsclient
+    abbr -a e 'emacsclient -a vim'
+    abbr -a vi 'emacsclient -t -a vim'
+    abbr -a vim 'emacsclient -t -a vim'
+end
+
+# https://github.com/sharkdp/fd is installed as fdfind in Debian/Ubuntu
+if type -q fdfind && not type -q fd
+    alias fd='fdfind'
+end
diff --git a/.config/fish/conf.d/aliases.fish b/.config/fish/conf.d/aliases.fish
deleted file mode 100644
index f8b7d9e..0000000
--- a/.config/fish/conf.d/aliases.fish
+++ /dev/null
@@ -1,57 +0,0 @@
-alias mv='mv -i'
-
-alias grep='grep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias egrep='egrep --color=auto'
-
-alias ga='git add'
-alias gp='git push'
-alias gl='git log'
-alias glp='git log -p'
-alias gs='git status -sb'
-alias gd='git diff'
-alias gc='git commit'
-alias gca='git commit --amend'
-alias gcm='git commit -m'
-alias gcma='git commit -ma'
-alias gb='git branch'
-alias gco='git checkout'
-alias gra='git remote add'
-alias gri='git rebase --interactive'
-alias grr='git remote rm'
-alias gpu='git pull'
-alias gcl='git clone'
-
-alias la='ls -a'
-alias ll='ls -l'
-
-# use exa instead of ls if available
-if type -q exa
-    alias ls='exa'
-    alias ee='exa -alF'
-    alias ll='exa -alF'
-    alias ea='exa -a'
-    alias la='exa -a'
-end
-
-# use eza instead of ls if available
-if type -q eza
-    alias ls='eza'
-    alias ee='eza -alF'
-    alias ll='eza -alF'
-    alias ea='eza -a'
-    alias la='eza -a'
-end
-
-
-# use running Emacs if available
-if type -q emacsclient
-    alias e='emacsclient -a vim'
-    alias vi='emacsclient -t -a vim'
-    alias vim='emacsclient -t -a vim'
-end
-
-# https://github.com/sharkdp/fd is installed as fdfind in Debian/Ubuntu
-if type -q fdfind
-    alias fd='fdfind'
-end