diff options
| author | David Runge <david.runge@frqrec.com> | 2014-06-17 16:14:19 +0200 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2014-06-17 16:14:19 +0200 |
| commit | cde6bd16bb48f0aecf98b656a9dcfef629e24d95 (patch) | |
| tree | 2fa89aff5efa703597710368dece60913befaf71 /.config | |
| parent | ac876bcfe938849005309a2cb5da01451094c81c (diff) | |
| parent | 3b44361df3ede6208faa6fc97d584d33889dedf5 (diff) | |
| download | dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.gz dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.bz2 dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.tar.xz dotfiles-cde6bd16bb48f0aecf98b656a9dcfef629e24d95.zip | |
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
Diffstat (limited to '.config')
| -rw-r--r-- | .config/dpms | 2 | ||||
| -rw-r--r-- | .config/user-dirs.dirs | 2 |
2 files changed, 2 insertions, 2 deletions
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" |