.bashrc: minor refactoring

[dotfiles.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index f3d2afb1a86bea829e394331b3da921adaa38b01..ac5325ef876ab5e60e4f6877230422e42d9e2789 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -179,8 +179,6 @@ then
 fi
 
 
-. virtualenvwrapper_lazy.sh 2>/dev/null
-
 if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then
     . "$VIRTUAL_ENV/bin/activate"
 fi
@@ -190,6 +188,16 @@ fi
 
 trap '[ "$VIRTUAL_ENV" ] && deactivate' EXIT
 
+. virtualenvwrapper_lazy.sh 2>/dev/null
+
+
+if test -x /usr/bin/screen >/dev/null 2>&1; then
+    screen_newwin() {
+        history -a
+        screen "$@"
+    }
+fi
+
 if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&1; then
     # From https://stackoverflow.com/a/18839557
 
@@ -207,10 +215,3 @@ if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&
 
     X() { history -a; _non_bash_X; history -r; }
 fi
-
-if test -x /usr/bin/screen >/dev/null 2>&1; then
-    screen_newwin() {
-        history -a
-        screen "$@"
-    }
-fi