Merge branch 'master' of https://github.com/davezerave/dot

* 'master' of https://github.com/davezerave/dot:
  Added more journalctl aliases.
  Adding alias for journalctl to see messages from this boot only.
  Adding further ignores for home directory
  Adding Arduino related vundles
  Adding Arduino preferences
  Adding locally compiled tmux-mem-cpu-load version
  Adding scripts to check weather currently running a realtime or vanilla kernel.
  Adding correct echo output to updated script.
  Changing output messages from Dropbox to ownCloud.
  Adding further aliases, cleaning up systemd aliases and others.
  Disabling the start of syndaemon, as a systemd user service is taking care of this now (hopefully)
  Updated user-dirs.dirs settings file to reflect further changes in user home structure.
  Raising the settings for night mode.
  Splitting settings for external server into separate config file.
  Adding newer Ardour version to settings.
  Deleting unneeded arduino preferences file
  Shifting to new key bindings config file 'bindings', deleting old ('keys'), updating config file to new settings format.

5 files changed, 47 insertions, 19 deletions

diff --git a/.config/dpms b/.config/dpms
index 47d6740..0e7a18d 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 sclang scsynth ardour-3.5.357 pdextended vlc )
+programs=( supercollider sclang scsynth ardour-3.5.378 pdextended vlc )
 
 # Programs run by python2
 python2=( keepnote )
diff --git a/.config/mpd/mpd-s4.conf b/.config/mpd/mpd-s4.conf
new file mode 100644
index 0000000..831cfc9
--- /dev/null
+++ b/.config/mpd/mpd-s4.conf
@@ -0,0 +1,32 @@
+
+music_directory "/home/dave/.config/mpd/folders"
+playlist_directory "/home/dave/.config/mpd/playlists"
+db_file "/home/dave/.config/mpd/mpd.db"
+log_file "/home/dave/.config/mpd/mpd.log"
+pid_file "/home/dave/.config/mpd/mpd.pid"
+state_file "/home/dave/.config/mpd/mpdstate"
+bind_to_address "127.0.0.1"
+port "6600"
+gapless_mp3_playback "yes"
+save_absolute_paths_in_playlists "yes"
+#zeroconf_enabled "yes"
+#zeroconf_name "dvzrv mpd"
+
+input {
+  plugin "curl"
+}
+
+audio_output {
+  type "pulse"
+  name "mpd"
+  mixer_type "software"
+  server "s4"  #optional
+}
+
+audio_output {
+  type "fifo"
+  name "mpd_fifo"
+  path "/tmp/mpd.fifo"
+  format "44100:16:2"
+}
+
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index aa1a2a6..6d0a20d 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -4,8 +4,7 @@ db_file "/home/dave/.config/mpd/mpd.db"
 log_file "/home/dave/.config/mpd/mpd.log"
 pid_file "/home/dave/.config/mpd/mpd.pid"
 state_file "/home/dave/.config/mpd/mpdstate"
-#bind_to_address "127.0.0.1"
-bind_to_address "::"
+bind_to_address "127.0.0.1"
 port "6600"
 gapless_mp3_playback "yes"
 save_absolute_paths_in_playlists "yes"
@@ -17,19 +16,16 @@ input {
 }
 
 audio_output {
-  type  "pulse"
-  name  "mpd"
-  mixer_type  "software"
-#  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"
+  type "pulse"
+  name "mpd"
+  mixer_type "software"
+  server "127.0.0.1"
 }
 
 audio_output {
-  type            "fifo"
-  name            "mpd_fifo"
-  path            "/tmp/mpd.fifo"
-  format          "44100:16:2"
+  type "fifo"
+  name "mpd_fifo"
+  path "/tmp/mpd.fifo"
+  format "44100:16:2"
 }
 
diff --git a/.config/redshift.conf b/.config/redshift.conf
index cec64bf..0cb8593 100644
--- a/.config/redshift.conf
+++ b/.config/redshift.conf
@@ -1,7 +1,7 @@
 ; Global settings
 [redshift]
 temp-day=8700
-temp-night=3700
+temp-night=4700
 brightness-day=1.0
 brightness-night=0.8
 transition=1
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index 9e0269d..35371ca 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -5,11 +5,11 @@
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
 # 
-XDG_DESKTOP_DIR="$HOME/"
+XDG_DESKTOP_DIR="$HOME/Desktop"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
 XDG_PUBLICSHARE_DIR="$HOME/ownCloud"
-XDG_DOCUMENTS_DIR="$HOME/"
+XDG_DOCUMENTS_DIR="$HOME/ownCloud/documents"
 XDG_MUSIC_DIR="$HOME/Music"
-XDG_PICTURES_DIR="$HOME/Pictures"
+XDG_PICTURES_DIR="$HOME/ownCloud/photos"
 XDG_VIDEOS_DIR="$HOME/Videos"
-XDG_TEMPLATES_DIR="$HOME/Dropbox"
+XDG_TEMPLATES_DIR="$HOME/ownCloud/Notes"