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

13 files changed, 43 insertions, 30 deletions

diff --git a/.autorandr/external-plugged/config b/.autorandr/external-plugged/config
index 3c6300e..d3f0f3d 100644
--- a/.autorandr/external-plugged/config
+++ b/.autorandr/external-plugged/config
@@ -5,6 +5,7 @@ off
 output DP1
 off
 output HDMI1
+primary
 mode 1920x1200
 pos 0x0
 output DP2
diff --git a/.config/dpms b/.config/dpms
index dedef03..47d6740 100644
--- a/.config/dpms
+++ b/.config/dpms
@@ -4,7 +4,7 @@
 # Arrays must be of the form array=( program otherprogram )
 
 # Pre-compiled programs
-programs=( supercollider ardour-3.5.357 pdextended vlc )
+programs=( supercollider sclang scsynth ardour-3.5.357 pdextended vlc )
 
 # Programs run by python2
 python2=( keepnote )
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index c03371d..9e0269d 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -8,7 +8,7 @@
 XDG_DESKTOP_DIR="$HOME/"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
 XDG_PUBLICSHARE_DIR="$HOME/ownCloud"
-XDG_DOCUMENTS_DIR="$HOME/Documents"
+XDG_DOCUMENTS_DIR="$HOME/"
 XDG_MUSIC_DIR="$HOME/Music"
 XDG_PICTURES_DIR="$HOME/Pictures"
 XDG_VIDEOS_DIR="$HOME/Videos"
diff --git a/.gitignore b/.gitignore
index ebdb903..406b842 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,9 +40,11 @@ Music/
 Pictures/
 Videos/
 backup/
+build/
 git/
 ownCloud/
 yankring_history_v2.txt
+svn/
 
 .ICEauthority
 .Mathematica/
@@ -255,6 +257,7 @@ yankring_history_v2.txt
 .processing/
 .profile
 .pryrc
+.pulse
 .pulse-cookie
 .python-eggs/
 .q3a/
diff --git a/.mpd/mpd.conf b/.mpd/mpd.conf
index 833faea..4d820e1 100644
--- a/.mpd/mpd.conf
+++ b/.mpd/mpd.conf
@@ -20,8 +20,8 @@ audio_output {
   type  "pulse"
   name  "mpd"
   mixer_type  "software"
-  server "127.0.0.1"
-#  server  "s4"  #optional
+#  server "127.0.0.1"
+  server  "s4"  #optional
 # sink "alsa_input.pci-0000_00_08.0.analog-stereo"
 # sink  "alsa_output.pci-0000_00_1b.0.analog-stereo"
 }
diff --git a/.rvmrc b/.rvmrc
deleted file mode 100644
index 8046d73..0000000
--- a/.rvmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-rvm_verify_downloads_flag=0 #verify downloaded gems and packages
-
diff --git a/.tmux.conf b/.tmux.conf
index 6fefcb7..586539c 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -62,7 +62,6 @@ setw -g mode-mouse on
 
 
 
-
 # Keep your finger on ctrl, or don't
 bind-key ^D detach-client
 
@@ -73,6 +72,14 @@ set -g status-keys vi
 # Use vi keybindings in copy and choice modes
 setw -g mode-keys vi
 
+# v and y like vi in copy-mode
+bind-key -t vi-copy 'v' begin-selection
+bind-key -t vi-copy 'y' copy-selection
+# clipboard settings
+set -s set-clipboard on
+bind-key C-p run "xclip -o | tmux load-buffer - ; tmux paste-buffer"
+bind-key C-y run "tmux save-buffer - | xclip -i"
+
 # set first window to index 1 (not 0) to map more to the keyboard layout...
 set -g base-index 1
 
diff --git a/.vundles.local b/.vundles.local
index 2d1b274..e0a0454 100644
--- a/.vundles.local
+++ b/.vundles.local
@@ -9,8 +9,12 @@ Bundle "sophacles/vim-processing"
 "latex
 Bundle "vim-scripts/LaTeX-Suite-aka-Vim-LaTeX"
 "octave
+<<<<<<< HEAD
 Bundle "sjas/octave.vim"
 " netrw
 Bundle "vim-scripts/netrw.vim"
 " ctrlp
 Bundle "vim-scripts/ctrlp.vim"
+=======
+Bundle "sjas/octave.vim"
+>>>>>>> 3b44361df3ede6208faa6fc97d584d33889dedf5
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
 }
diff --git a/bin/autostart b/bin/autostart
index fbd3f8d..9d70ad0 100755
--- a/bin/autostart
+++ b/bin/autostart
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Auto starting various programs post lightdm
 
-export DISPLAY=:0.0
+export DISPLAY=:0
 export XAUTHORITY=/home/dave/.Xauthority
 
 KERNEL_NAME=$(uname -r)
@@ -14,9 +14,9 @@ if [[ "$KERNEL_NAME" != *rt* ]]; then
   else
     dropbox start &
   fi
-  pulseaudio --start &
-  nm-applet &
-  firewall-applet &
+#  pulseaudio --start &
+#  nm-applet &
+#  firewall-applet &
 else
   pulseaudio --kill &
   qjackctl &
diff --git a/bin/backup-profiles b/bin/backup-profiles
index db3dc66..fd7eb3b 100755
--- a/bin/backup-profiles
+++ b/bin/backup-profiles
@@ -12,7 +12,7 @@ firefoxIF=~/.mozilla/firefox/
 thunderbirdIF=~/.thunderbird/
 profileName=dvzrv
 backupEND=-backup
-OF=~/Dropbox/sync
+OF=~/ownCloud/backup/web
 gpgEND=.gpg
 
 
diff --git a/bin/backup-settings b/bin/backup-settings
index 955a59e..1a9cc12 100755
--- a/bin/backup-settings
+++ b/bin/backup-settings
@@ -2,7 +2,7 @@
 
 etcTMP=/tmp/etc.tgz
 etcIF=/etc
-OF=/home/dave/Dropbox/sync
+OF=/home/dave/ownCloud/backup/settings
 gpgEND=.gpg
 
 echo "Backing up /etc directory."
@@ -11,7 +11,7 @@ echo "Encrypting compressed directory."
 su - dave -c "gpg -e -r 'David Runge <david.runge@frqrec.com>' $etcTMP"
 echo "Changing permissions on file."
 chown dave:dave $etcTMP$gpgEND 
-echo "Moving backup to Dropbox."
+echo "Moving backup to ownCloud."
 mv -f $etcTMP$gpgEND $OF
 echo "Cleaning up."
 rm $etcTMP
diff --git a/bin/start_jack b/bin/start_jack
index d28733c..48e97ed 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -13,7 +13,7 @@ case "$HOSTNAME" in
     EXTERNAL="card 1"
     if [[ "$CARDS" == *$EXTERNAL* ]];then
       echo "Starting with external USB card"
-      /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p128 -n3 -s &> ~/.log/jackd.log &
+      /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p2048 -n3 -s &> ~/.log/jackd.log &
     else
       echo "Starting with internal HDMI card"
       /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:0,0 -p128 -n3 -s &> ~/.log/jackd.log &