diff options
| author | David Runge <david.runge@frqrec.com> | 2014-06-17 19:50:09 +0200 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-06-17 19:50:09 +0200 |
| commit | d923be90db7f9dbe976c62aacaa907cc971768dd (patch) | |
| tree | 1688219288c2adb4639ed2fbe013a19057b61808 | |
| parent | 9660eb720076fbc199cd2d4561ba2bd6d865399f (diff) | |
| parent | 26b672d22f535e41e882bd1f1483edad00afce79 (diff) | |
| download | dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.tar.gz dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.tar.bz2 dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.tar.xz dotfiles-d923be90db7f9dbe976c62aacaa907cc971768dd.zip | |
Merge branch 'master' of https://github.com/davezerave/dot
* 'master' of https://github.com/davezerave/dot:
Cleaning up merge mess
Adding netrw and ctrlp vim plugins
| -rw-r--r-- | .autorandr/external-plugged/config | 1 | ||||
| -rw-r--r-- | .config/dpms | 2 | ||||
| -rw-r--r-- | .config/user-dirs.dirs | 2 | ||||
| -rw-r--r-- | .mpd/mpd.conf | 4 | ||||
| -rw-r--r-- | .rvmrc | 2 | ||||
| -rw-r--r-- | .vundles.local | 6 | ||||
| -rwxr-xr-x | bin/autostart | 8 | ||||
| -rwxr-xr-x | bin/backup-profiles | 2 | ||||
| -rwxr-xr-x | bin/backup-settings | 4 |
9 files changed, 17 insertions, 14 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/.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" } @@ -1,2 +0,0 @@ -rvm_verify_downloads_flag=0 #verify downloaded gems and packages - diff --git a/.vundles.local b/.vundles.local index b020552..2d1b274 100644 --- a/.vundles.local +++ b/.vundles.local @@ -9,4 +9,8 @@ Bundle "sophacles/vim-processing" "latex Bundle "vim-scripts/LaTeX-Suite-aka-Vim-LaTeX" "octave -Bundle "sjas/octave.vim"
\ No newline at end of file +Bundle "sjas/octave.vim" +" netrw +Bundle "vim-scripts/netrw.vim" +" ctrlp +Bundle "vim-scripts/ctrlp.vim" 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 |