diff --git a/fish/config.fish b/fish/config.fish
index 0a97c85..d89ee4d 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -35,8 +35,14 @@ alias Q=' exit'
 alias x=' exit'
 alias cd..='cd ..'
 if [ -z $SSH_CLIENT ]
-    ~/.mmk2410
+	~/.mmk2410
+end
+
+if [ -z $EDITOR ]
+	set -Ux EDITOR emacs -nw
+end
+
+if [ -z $VISUAL ]
+	set -Ux VISUAL emacs -nw
 end
 
-set -Ux EDITOR nvim
-set -Ux VISUAL nvim