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

---
 bashrc | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'bashrc')

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"
-- 
cgit v1.2.3