diff --git a/modules/shell/files/environment.sh b/modules/shell/files/environment.sh
index 46a8445..8701857 100644
--- a/modules/shell/files/environment.sh
+++ b/modules/shell/files/environment.sh
@@ -11,3 +11,4 @@ export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S'
 export HISTCONTROL=ignoreboth
 
 export BROWSER=$(which firefox)
+export EDITOR=$(which vim)
diff --git a/modules/shell/files/global-environment b/modules/shell/files/global-environment
index a6587ea..0eca061 100644
--- a/modules/shell/files/global-environment
+++ b/modules/shell/files/global-environment
@@ -3,8 +3,6 @@ QT_QPA_PLATFORMTHEME=gtk2
 GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 LANG=en_GB.UTF-8
 ARCHFLAGS="-arch x86_64"
-BROWSER=/usr/bin/firefox
-EDITOR=/usr/bin/vim
 SSH_AUTH_SOCK=/tmp/ssh-agent-jake.sock
 TERMINATOR=/usr/bin/tilix
 NNN_DE_FILE_MANAGER=nautilus