diff options
| author | David Runge <dave@sleepmap.de> | 2015-03-25 16:29:07 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2015-03-25 16:29:07 +0100 |
| commit | 32e8f95bb412d6f61afdd18836976061635378e5 (patch) | |
| tree | c0e6e65d7c5aa46ce942001051b0c35e97391283 /.config/mpd | |
| parent | 6867bda2d82e01c1daf81ee4b39443ecc6609694 (diff) | |
| parent | a0ef42e0a70ac6264835ba77936d1ba5bf2294fe (diff) | |
| download | dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.gz dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.bz2 dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.tar.xz dotfiles-32e8f95bb412d6f61afdd18836976061635378e5.zip | |
Merge branch 'master' of /home/git/repositories/dotfiles
* 'master' of /home/git/repositories/dotfiles: (60 commits)
.config/systemd/user/default.target.wants/*: Deleting all user services. Not good to have them started as root.
export.zsh: Don't use /run/user/ directory for roots TMUX_TMPDIR.
.irssi: Removing irssi as gitmodule, adding it to .gitignore (so it can be added again, without being a gitmodule).
.gitignore: Adding some now unneeded stuff that will popup from time to time.
.zprezto: Updating to c34098af20cafdf016f68f3e7f612ed60ca93aa1
.irssi: Updating .irssi submodule to latest commit.
.vim/addons-settings.vim: Removing powerline support and replacing ugly stuff with ascii characters.
.vdirsyncer/config: Encapsulating paths with ~ in double quotes, as vdirsyncer creates a weird ~ folder in your home otherwise.
termite/config: Switching to Inconsolata (made available through powerline-fonts-git).
pavucontrol.ini: Removing, as it's going to be rewritten each call anyways.
.tmux.conf: Updating colours, incorporating tpm, removing powerline stuff.
.compton.conf: Adding MPlayer to comptons exclude lists.
Updating irssi settings.
.autorandr/*: Clean slate for all autorandr profiles.
.password-store: Updating password store to latest commits.
.gitignore: Removing some unneeded stuff that has been added to the repo.
fonts.conf: Updating to a correct path structure.
.fonts: Removing top level configuration.
.fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
.fonts.conf: Adding a custom fontconfig cache dir, so .cache can be a tmpfs and won't need a symlink to the fontconfig directory.
...
Diffstat (limited to '.config/mpd')
| l--------- | .config/mpd/folders/Artists | 1 | ||||
| l--------- | .config/mpd/folders/Various Artists | 1 | ||||
| -rw-r--r-- | .config/mpd/mpd.conf | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.config/mpd/folders/Artists b/.config/mpd/folders/Artists new file mode 120000 index 0000000..a2225ce --- /dev/null +++ b/.config/mpd/folders/Artists @@ -0,0 +1 @@ +/mnt/music/Artists
\ No newline at end of file diff --git a/.config/mpd/folders/Various Artists b/.config/mpd/folders/Various Artists new file mode 120000 index 0000000..d21d487 --- /dev/null +++ b/.config/mpd/folders/Various Artists @@ -0,0 +1 @@ +/mnt/music/Various Artists
\ No newline at end of file diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 6d0a20d..42ff040 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -19,7 +19,7 @@ audio_output { type "pulse" name "mpd" mixer_type "software" - server "127.0.0.1" +# server "127.0.0.1" } audio_output { |