diff --git a/bash/.bashrc b/bash/.bashrc
index 6141cb0..02b38b3 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -5,7 +5,7 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-alias ls='ls --color=auto'
+alias ls='ls -G'
 PS1='[\u@\h \W]\$ '
 
 if [ -f /usr/share/nvm/init-nvm.sh ];
@@ -16,7 +16,17 @@ fi
 GPG_TTY=$(tty)
 export GPG_TTY
 
+if [ -f /usr/local/bin/virtualenvwrapper.sh ];
+then
+    export WORKON_HOME=$HOME/.virtualenvs
+    source /usr/local/bin/virtualenvwrapper.sh
+fi
+
 if [ -x "$(command -v direnv)" ];
 then
     eval "$(direnv hook bash)"
 fi
+
+alias edit='emacsclient -nw'
+EDITOR='emacsclient -nw'
+export EDITOR