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

4 files changed, 8 insertions, 8 deletions

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 &