From d32d3ed13ed5c6a71c61bb869fe02a34d7fb85ac Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Thu, 26 Feb 2015 13:44:32 +0100
Subject: Added vim-nerdtree-tabs to vim and updated bashrc

---
 .gitmodules                  |  3 +++
 bashrc                       | 16 +++++++++++-----
 liquidpromptrc               |  2 +-
 vim/bundle/vim-nerdtree-tabs |  1 +
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 160000 vim/bundle/vim-nerdtree-tabs

diff --git a/.gitmodules b/.gitmodules
index 60a1468..d254dd7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "vim/bundle/vim-fugitive"]
 	path = vim/bundle/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive.git
+[submodule "vim/bundle/vim-nerdtree-tabs"]
+	path = vim/bundle/vim-nerdtree-tabs
+	url = https://github.com/jistr/vim-nerdtree-tabs.git
diff --git a/bashrc b/bashrc
index 8198b11..c736b50 100644
--- a/bashrc
+++ b/bashrc
@@ -5,6 +5,9 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
+alias ls='ls --color=auto'
+alias jblive='mpv rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream 2> /dev/null &' 
+
 cd() {
 	builtin cd "$@" && ls -A	
 }
@@ -25,13 +28,16 @@ man() {
 }
 
 vim() {
-	(cd $@ && /usr/bin/vim) || /usr/bin/vim $@
+	if [[ -z $@ ]]; then
+		/usr/bin/vim
+	elif [[ -d $@ ]]; then
+		dir=$(pwd)
+		cd $@ && /usr/bin/vim && cd $dir
+	else
+		/usr/bin/vim $@
+	fi
 }
 
-alias ls='ls --color=auto'
-alias jblive='mpv rtmp://videocdn-us.geocdn.scaleengine.net/jblive/live/jblive.stream 2> /dev/null &' 
-
-
 export PS1='[\d][\t]\u on \h\n\w => '
 export GOPATH="$HOME/programming/go"
 export PATH="$PATH:$GOPATH/bin"
diff --git a/liquidpromptrc b/liquidpromptrc
index 1cb350c..57414d5 100755
--- a/liquidpromptrc
+++ b/liquidpromptrc
@@ -113,7 +113,7 @@ LP_RUNTIME_THRESHOLD=2
 LP_ENABLE_VIRTUALENV=1
 
 # Show average system temperature
-LP_ENABLE_TEMP=1
+LP_ENABLE_TEMP=0
 
 # When showing time, use an analog clock instead of numeric values.
 # The analog clock is "accurate" to the nearest half hour.
diff --git a/vim/bundle/vim-nerdtree-tabs b/vim/bundle/vim-nerdtree-tabs
new file mode 160000
index 0000000..0decec1
--- /dev/null
+++ b/vim/bundle/vim-nerdtree-tabs
@@ -0,0 +1 @@
+Subproject commit 0decec122e9bb3e9328b01fa20a9650e79cc6ca7
-- 
cgit v1.2.3