diff --git a/fish/conf.d/aliases.fish b/fish/conf.d/aliases.fish
index fa1bc32..bdeb5e5 100644
--- a/fish/conf.d/aliases.fish
+++ b/fish/conf.d/aliases.fish
@@ -1,6 +1,7 @@
+alias vim nvim
 alias open xdg-open
 alias cat 'bat --paging=never'
 alias less 'bat --paging=always'
 alias ls exa
 alias rcp 'rsync -rclh --progress --'
-alias vim 'nvim'
+
diff --git a/fish/conf.d/editor.fish b/fish/conf.d/editor.fish
index 36770c5..20a6b1a 100644
--- a/fish/conf.d/editor.fish
+++ b/fish/conf.d/editor.fish
@@ -1,3 +1,3 @@
-export EDITOR=nvim
-export VISUAL=nvim
-export PSQL_EDITOR=nvim
+export EDITOR="vim"
+export VISUAL="vim"
+export PSQL_EDITOR="vim"