Merge branch 'master' of https://github.com/davezerave/dot

Merging local and work settings for additional vundles
* 'master' of https://github.com/davezerave/dot:
  Adding bindings for vi-copy mode in tmux
  Adding more work related ignores
  Adding octave support
  Retabbing, customizing to my user
  Adding more bbb specific JACK settings

Conflicts:
	.vundles.local

1 files changed, 15 insertions, 15 deletions

diff --git a/.zsh.after/unixpool b/.zsh.after/unixpool
index d3498a1..e2edade 100644
--- a/.zsh.after/unixpool
+++ b/.zsh.after/unixpool
@@ -49,23 +49,23 @@ fi
 
 ## FUNCTIONS
 function music_update() {
-	echo "updating zip files"
-	for i in */*; 
-	do
-		name=`echo $i | sed 's/\ /_/g' | sed 's/\//-/g'`
-		if [ ! -e $name.zip ]; 
-		then 
-			echo "packing $i as $name.zip"
-			zip -r $name.zip $i
-		fi
-	done
-	echo "done"
+  echo "updating zip files"
+  for i in */*; 
+  do
+    name=`echo $i | sed 's/\ /_/g' | sed 's/\//-/g'`
+    if [ ! -e $name.zip ]; 
+    then 
+      echo "packing $i as $name.zip"
+      zip -r $name.zip $i
+    fi
+  done
+  echo "done"
 }
 
 function makantine() {
-    wget http://personalkantine.personalabteilung.tu-berlin.de/pdf/MA-aktuell.pdf -O /tmp/makantine.$$.pdf >&/dev/null
-    xpdf -cont -z page /tmp/makantine.$$.pdf
-    rm -f /tmp/makantine.$$.pdf
+  wget http://personalkantine.personalabteilung.tu-berlin.de/pdf/MA-aktuell.pdf -O /tmp/makantine.$$.pdf >&/dev/null
+  xpdf -cont -z page /tmp/makantine.$$.pdf
+  rm -f /tmp/makantine.$$.pdf
 }
 
 function pxeln() {
@@ -121,5 +121,5 @@ function pxeln() {
 }
 
 function mailhighscore() {
-		for i in /homes/wheel/*; do n=`basename $i`; echo `grep $n /var/spool/mail/konni | grep -c From` $n; done | sort -nr
+  for i in /homes/wheel/*; do n=`basename $i`; echo `grep $n /var/spool/mail/runge | grep -c From` $n; done | sort -nr
 }