diff --git a/dotfiles-old/.env b/dotfiles-old/.env
index 44448fe..950ca4c 100644
--- a/dotfiles-old/.env
+++ b/dotfiles-old/.env
@@ -1,19 +1,7 @@
-DOOMWADDIR=/mnt/partone/misc/doomwads/; export DOOMWADDIR
-EDITOR=vim; export EDITOR
-PAGER="less"; export PAGER
-
-PATH="$HOME/bin/:$HOME/bin/oneliners/:"$PATH
-PATH=$PATH":$PLAN9/bin"
-export PATH
-
-PLAN9=/usr/local/plan9; export PLAN9
+if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi
 
 PS1="; "
 PS2=";   "
 PS3=";     "
 
-if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi
-
-set -o vi
-
 . $HOME/.aliases
diff --git a/dotfiles-old/.profile b/dotfiles-old/.profile
index 083fe5e..44015bd 100644
--- a/dotfiles-old/.profile
+++ b/dotfiles-old/.profile
@@ -1 +1,12 @@
-ENV="$HOME"/.env; export ENV
+DOOMWADDIR=/mnt/partone/misc/doomwads/; export DOOMWADDIR
+EDITOR=vim; export EDITOR
+PAGER="less"; export PAGER
+
+PLAN9=/usr/local/plan9; export PLAN9
+
+PATH="$HOME/bin/:$HOME/bin/oneliners/:"$PATH":$PLAN9/bin"; export PATH
+
+if [ "$0" = "bash" ] || [ "$0" = "-bash" ]; then complete -c man which; fi
+
+ENV=$HOME/.env; export ENV
+. $ENV