diff --git a/config/fish/config.fish b/config/fish/config.fish
index a09f339..ee19e52 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -39,9 +39,13 @@ if status is-interactive
         alias vim v
         alias vi v
         alias mini "NVIM_APPNAME=mini.nvim nvim"
+        set -gx EDITOR nvim
     end 
-    command -qv vim && alias vi vim && alias v vim
-    set -gx EDITOR vim
+    if command -qv vim;
+        alias vi vim 
+        alias v vim
+        set -gx EDITOR vim
+    end
 
     command -qv jj && alias rev "jj log -G -T 'commit_id.short(8)'"