diff --git a/shells/fish/conf.d/emacs.fish b/shells/fish/conf.d/00-emacs.fish
similarity index 100%
rename from shells/fish/conf.d/emacs.fish
rename to shells/fish/conf.d/00-emacs.fish
diff --git a/shells/fish/conf.d/env.fish b/shells/fish/conf.d/00-env.fish
similarity index 94%
rename from shells/fish/conf.d/env.fish
rename to shells/fish/conf.d/00-env.fish
index 73bb4b3..5024860 100644
--- a/shells/fish/conf.d/env.fish
+++ b/shells/fish/conf.d/00-env.fish
@@ -23,12 +23,11 @@ set -x ARCHFLAGS -arch_x86_64
 set -e GPG_TTY
 set -Ux GPG_TTY (tty)
 
-if test -z $EDITOR
-    set -Ux EDITOR es
-end
+set -e EDITOR
+set -Ux EDITOR "emacsclient -"t
 
 if test -z $VISUAL
-    set -Ux VISUAL es
+    set -Ux VISUAL emacsclient -t
 end
 
 if test -z $GIT_EDITOR
diff --git a/shells/fish/conf.d/abbr.fish b/shells/fish/conf.d/10-abbr.fish
similarity index 84%
rename from shells/fish/conf.d/abbr.fish
rename to shells/fish/conf.d/10-abbr.fish
index e5f9ce8..ce374a8 100644
--- a/shells/fish/conf.d/abbr.fish
+++ b/shells/fish/conf.d/10-abbr.fish
@@ -23,10 +23,10 @@
 # See: https://fishshell.com/docs/current/commands.html#abbr
 
 if status --is-interactive
-    abbr --add --global l ls
-    abbr --add --global ping ping -c 3 mmk2410.org
-    abbr --add --global pingtest ping -c 3 mmk2410.org
-    abbr --add --global e eval $EDITOR
-    abbr --add --global g git
-    abbr --add --global s sudo
+    abbr --add l ls
+    abbr --add ping ping -c 3 mmk2410.org
+    abbr --add pingtest ping -c 3 mmk2410.org
+    abbr --add e eval $EDITOR
+    abbr --add g git
+    abbr --add s sudo
 end
diff --git a/shells/fish/conf.d/alias.fish b/shells/fish/conf.d/10-alias.fish
similarity index 100%
rename from shells/fish/conf.d/alias.fish
rename to shells/fish/conf.d/10-alias.fish
diff --git a/shells/fish/conf.d/nix.fish b/shells/fish/conf.d/40-nix.fish
similarity index 100%
rename from shells/fish/conf.d/nix.fish
rename to shells/fish/conf.d/40-nix.fish
diff --git a/shells/fish/conf.d/debian.fish b/shells/fish/conf.d/60-debian.fish
similarity index 100%
rename from shells/fish/conf.d/debian.fish
rename to shells/fish/conf.d/60-debian.fish
diff --git a/shells/fish/conf.d/x.fish b/shells/fish/conf.d/99-x.fish
similarity index 100%
rename from shells/fish/conf.d/x.fish
rename to shells/fish/conf.d/99-x.fish