diff --git a/bash/.bashrc b/bash/.bashrc
index 88b1564..6adb3ee 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-PATH=$HOME/.local/share/bin/:$PATH
 
 function load() {
   if [ -f "$1" ]; then
@@ -7,6 +6,7 @@ function load() {
   fi
 }
 
+load $HOME/.bashrc.d/env
 load $HOME/.bashrc.d/aliases
 load $HOME/.bashrc.d/git
 load $HOME/.bashrc.d/ps1
diff --git a/bash/.bashrc.d/env b/bash/.bashrc.d/env
new file mode 100644
index 0000000..09db25e
--- /dev/null
+++ b/bash/.bashrc.d/env
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+export PATH=$HOME/.local/share/bin/:$PATH
+
+if which vim >/dev/null 2>&1; then
+  export EDITOR=vim
+fi