Merge branch 'master' of sleepmap.de:config/dotfiles

* 'master' of sleepmap.de:config/dotfiles: (28 commits)
  .config/qtile/config.py: Disabling broken TreeTab layout. Adding scide to  dev. Changing background picture to lowercase. Enabling notification widget.
  .zsh.after/aliases.zsh: Adding automatic selection of audio backends for mpv.
  bin/set_volume: Adding further increase/decrease shortcuts.
  .scvimrc: Adding system runtimepath for .sc files.
  .config/mpd/mpd-trvlr-jack.conf: Adding mpd configuration for trvlr using JACK.
  .config/mpd/mpd-trvlr.conf: Adding mpd configuration for trlvr.
  .config/mpd/mpd.conf: Switching audio backend to JACK in default mpd config.
  .config/conky/side: Removing broken xft settings.
  .config/compton.conf
  .config/SuperCollider/startupfiles/rme_fireface800.scd: Removing obsolete configurations.
  .config/SuperCollider/startup.scd: Adding a generic startupFile for SuperCollider.
  .gitignore: Unignoring SuperCollider's startup file.
  .processing/preferences.txt: Removing configuration due to constant regneration and metadata leakage.
  .config/patchagerc: Removing useless configuration.
  .config/SuperCollider/sc_ide_conf.yaml: Removing redundant sc_ide_conf.yaml.
  .arduino/preferences.txt: Removing arduino preferences due to redundancy.
  .scvimrc: Using horizontal split in tmux. Removing old trash from ftplugin identifiers. Using SClangStart only on scd files.
  .config/gtk-3.0/gtk.css: Adding css to disable double drawing of menus/title bars and client-side decoration.
  .config/compton.conf: Disabling fading (too slow). Lowering shadow-radius, so it won't interfere with WM bars.
  .vdirsyncer/config: Adding 'b wins' conflict_resolution for akt.
  ...

12 files changed, 120 insertions, 207 deletions

diff --git a/.config/SuperCollider/sc_ide_conf.yaml b/.config/SuperCollider/sc_ide_conf.yaml
deleted file mode 100644
index 9fb139f..0000000
--- a/.config/SuperCollider/sc_ide_conf.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-IDE:
-  editor:
-    blinkDuration: 600
-    font:
-      antialias: 2
-      family: DejaVu Sans Mono
-      size: 10
-    indentWidth: 4
-    lineWrap: true
-    spaceIndent: false
-    stepForwardEvaluation: false
-    theme: My old theme
-    themes:
-      My old theme:
-        built-in: !textFormat
-          color: "#3333bf"
-          italic: false
-        char: !textFormat
-          color: "#007300"
-          italic: false
-        class: !textFormat
-          color: "#0000d2"
-          italic: false
-        comment: !textFormat
-          color: "#bf0000"
-          italic: false
-        currentLine: !textFormat
-          color: "#000000"
-          background: "#f4f4f4"
-          italic: false
-        env-var: !textFormat
-          color: "#8c4614"
-          italic: false
-        evaluatedCode: !textFormat
-          color: "#000000"
-          background: "#f8a200"
-        keyword: !textFormat
-          color: "#0000e6"
-          bold: true
-          italic: false
-        lineNumbers: !textFormat
-          {}
-        matchingBrackets: !textFormat
-          color: "#ff0000"
-          bold: true
-        mismatchedBrackets: !textFormat
-          color: "#ffffff"
-          background: "#960000"
-          italic: false
-        number: !textFormat
-          color: "#980099"
-          italic: false
-        postwindowemphasis: !textFormat
-          color: "#000000"
-          bold: true
-          italic: false
-        postwindowerror: !textFormat
-          color: "#d11c24"
-          italic: false
-        postwindowsuccess: !textFormat
-          color: "#738a05"
-          italic: false
-        postwindowtext: !textFormat
-          color: "#000000"
-          italic: false
-        postwindowwarning: !textFormat
-          color: "#a57706"
-          italic: false
-        primitive: !textFormat
-          color: "#3333bf"
-          italic: false
-        searchResult: !textFormat
-          color: "#7a7a7a"
-          background: "#36475a"
-        selection: !textFormat
-          {}
-        string: !textFormat
-          color: "#5f5f5f"
-          italic: false
-        symbol: !textFormat
-          color: "#007300"
-          italic: false
-        text: !textFormat
-          {}
-        whitespace: !textFormat
-          color: "#7f7f7f"
-          italic: false
-  interpreter:
-    autoStart: true
-    runtimeDir: ""
-  mainWindow:
-    detached: !QVariantMap
-      documents-dock: ""
-      help-dock: ""
-      post-dock: ""
-    geometry: AdnQywACAAAAAAAAAAAAEgAABVUAAAL/AAAAAgAAABQAAAVTAAAC/QAAAAACAAAABVY=
-    state: AAAA/wAAAAD9AAAAAgAAAAAAAAAAAAAAAPwCAAAAAfsAAAAcAGQAbwBjAHUAbQBlAG4AdABzAC0AZABvAGMAawAAAAAA/////wAAAF4A////AAAAAQAAAh4AAAK+/AIAAAAC+wAAABIAaABlAGwAcAAtAGQAbwBjAGsBAAAAEwAAAWQAAABMAP////sAAAASAHAAbwBzAHQALQBkAG8AYwBrAQAAAXgAAAFZAAAATAD///8AAAMzAAACvgAAAAEAAAACAAAAAQAAAAL8AAAAAA==
-  postWindow:
-    lineWrap: false
-    scrollback: 1000
-  recentDocuments: !QVariantList
-    []
-  shortcuts:
-    editor-document-next: Alt+K
-    editor-document-previous: Alt+J
-  startWithSession: last
\ No newline at end of file
diff --git a/.config/SuperCollider/startup.scd b/.config/SuperCollider/startup.scd
new file mode 100644
index 0000000..413d8b0
--- /dev/null
+++ b/.config/SuperCollider/startup.scd
@@ -0,0 +1,7 @@
+
+Server.local.options.numOutputBusChannels = 2;
+Server.local.options.numInputBusChannels = 2;
+
+if(("ls /dev/fw1".systemCmd) < 0, {
+  File.readInterpret(Platform.userConfigDir++"/startupfiles/rme_fireface800.scd");
+});
diff --git a/.config/SuperCollider/startupfiles/electronicStudio.scd b/.config/SuperCollider/startupfiles/electronicStudio.scd
deleted file mode 100644
index b37b732..0000000
--- a/.config/SuperCollider/startupfiles/electronicStudio.scd
+++ /dev/null
@@ -1,49 +0,0 @@
-//Server.local.options.numOutputBusChannels = 12;    // change number of input and output channels
-Server.local.options.numOutputBusChannels = 8;    // change number of input and output channels
-Server.local.options.numInputBusChannels = 0;//8;
-//Server.local.options.blockSize = 128; //256; // increase block size (default is 64)
-Server.local.options.sampleRate = 41000; //96000; // increase sampling rate (if your hardware supports it)
-Server.local.options.memSize = 6291456;//2097152; // 1048576;
-Server.local.options.maxNodes = 65536;
-//Server.local.options.maxSynthDefs = 16384;
-
-// hook up jack ports to audio channels
-//"SC_JACK_DEFAULT_INPUTS".setenv(
-//"rme_fireface:adat-01-in,
-// rme_fireface:adat-02-in,
-// rme_fireface:adat-03-in,
-// rme_fireface:adat-04-in,
-// rme_fireface:adat-05-in,
-// rme_fireface:adat-06-in,
-// rme_fireface:adat-07-in,
-// rme_fireface:adat-08-in,
-// rme_fireface:adat-09-in,
-// rme_fireface:adat-10-in,
-// rme_fireface:adat-11-in,
-// rme_fireface:adat-12-in,
-// rme_fireface:adat-13-in,
-// rme_fireface:adat-14-in,
-// rme_fireface:adat-15-in,
-// rme_fireface:adat-16-in"
-//);
-//"SC_JACK_DEFAULT_OUTPUTS".setenv(
-//"system"
-//"firewire_pcm:0000a350026756bfa_pbk_analog-1_out"
-//"rme_fireface:adat-01-out"
-//"rme_fireface:adat-01-out,
-// rme_fireface:adat-02-out,
-// rme_fireface:adat-03-out,
-// rme_fireface:adat-04-out,
-// rme_fireface:adat-05-out,
-// rme_fireface:adat-06-out,
-// rme_fireface:adat-07-out,
-// rme_fireface:adat-08-out,
-// rme_fireface:adat-09-out,
-// rme_fireface:adat-10-out,
-// rme_fireface:adat-11-out,
-// rme_fireface:adat-12-out,
-// rme_fireface:adat-13-out,
-// rme_fireface:adat-14-out,
-// rme_fireface:adat-15-out,
-// rme_fireface:adat-16-out"
-//);
diff --git a/.config/SuperCollider/startupfiles/rme_fireface800.scd b/.config/SuperCollider/startupfiles/rme_fireface800.scd
new file mode 100644
index 0000000..2956e09
--- /dev/null
+++ b/.config/SuperCollider/startupfiles/rme_fireface800.scd
@@ -0,0 +1,8 @@
+Server.local.options.numOutputBusChannels = 28;
+Server.local.options.numInputBusChannels = 28;
+Server.local.options.blockSize = 128; //256; // increase block size (default is 64)
+//Server.local.options.sampleRate = 41000; //96000; // increase sampling rate (if your hardware supports it)
+//Server.local.options.memSize = 6291456;//2097152; // 1048576;
+//Server.local.options.maxNodes = 65536;
+//Server.local.options.maxSynthDefs = 16384;
+
diff --git a/.config/compton.conf b/.config/compton.conf
index 378058e..1940a1a 100644
--- a/.config/compton.conf
+++ b/.config/compton.conf
@@ -4,9 +4,9 @@ no-dock-shadow = true;    # Avoid drawing shadows on dock/panel windows.
 no-dnd-shadow = true;   # Don't draw shadows on DND windows.
 clear-shadow = true;    # Zero the part of the shadow's mask behind the
         # window. Fix some weirdness with ARGB windows.
-shadow-radius = 7;    # The blur radius for shadows. (default 12)
-shadow-offset-x = -7;   # The left offset for shadows. (default -15)
-shadow-offset-y = -7;   # The top offset for shadows. (default -15)
+shadow-radius = 0; #5;    # The blur radius for shadows. (default 12)
+shadow-offset-x = 0; #-7;   # The left offset for shadows. (default -15)
+shadow-offset-y = 0; #-7;   # The top offset for shadows. (default -15)
 # shadow-opacity = 0.7;   # The translucency for shadows. (default .75)
 # shadow-red = 0.0;   # Red color value of shadow. (0.0 - 1.0, defaults to 0)
 # shadow-green = 0.0;   # Green color value of shadow. (0.0 - 1.0, defaults to 0)
@@ -51,10 +51,10 @@ blur-background-exclude = [
 # Exclude conditions for background blur.
 
 # Fading
-fading = true;      # Fade windows during opacity changes.
-# fade-delta = 30;    # The time between steps in a fade in milliseconds. (default 10).
-fade-in-step = 0.03;    # Opacity change between steps while fading in. (default 0.028).
-fade-out-step = 0.03;   # Opacity change between steps while fading out. (default 0.03).
+#fading = true;      # Fade windows during opacity changes.
+fade-delta = 9;    # The time between steps in a fade in milliseconds. (default 10).
+fade-in-step = 0.02;    # Opacity change between steps while fading in. (default 0.028).
+fade-out-step = 0.02;   # Opacity change between steps while fading out. (default 0.03).
 # no-fading-openclose = true; # Avoid fade windows in/out when opening/closing.
 fade-exclude = [
   "name *= 'VLC'",
diff --git a/.config/conky/side b/.config/conky/side
index 5defca8..c6895e2 100755
--- a/.config/conky/side
+++ b/.config/conky/side
@@ -1,5 +1,3 @@
-use_xft yes
-xftfont 123:size=8
 xftalpha 0.1
 background true
 total_run_times 0
diff --git a/.config/gtk-3.0/gtk.css b/.config/gtk-3.0/gtk.css
index 5dead4a..efc4686 100644
--- a/.config/gtk-3.0/gtk.css
+++ b/.config/gtk-3.0/gtk.css
@@ -8,3 +8,17 @@
 .titlebar {
  border-radius: 0;
 }
+
+.window-frame.csd.popup {
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13);
+}
+
+.header-bar {
+  background-image: none;
+  background-color: #ededed;
+  box-shadow: none;
+}
+
+GtkLabel.title {
+    opacity: 0;
+}
diff --git a/.config/mpd/mpd-trvlr-jack.conf b/.config/mpd/mpd-trvlr-jack.conf
new file mode 100644
index 0000000..7f4f9bb
--- /dev/null
+++ b/.config/mpd/mpd-trvlr-jack.conf
@@ -0,0 +1,30 @@
+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 "jack"
+  name "mpd"
+  mixer_type "software"
+}
+
+audio_output {
+  type "fifo"
+  name "mpd_fifo"
+  path "/run/user/1000/mpd/fifo"
+  format "44100:16:2"
+}
+
diff --git a/.config/mpd/mpd-trvlr.conf b/.config/mpd/mpd-trvlr.conf
new file mode 100644
index 0000000..294d26a
--- /dev/null
+++ b/.config/mpd/mpd-trvlr.conf
@@ -0,0 +1,30 @@
+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"
+}
+
+audio_output {
+  type "fifo"
+  name "mpd_fifo"
+  path "/run/user/1000/mpd/fifo"
+  format "44100:16:2"
+}
+
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 294d26a..7f4f9bb 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -16,7 +16,7 @@ input {
 }
 
 audio_output {
-  type "pulse"
+  type "jack"
   name "mpd"
   mixer_type "software"
 }
diff --git a/.config/patchagerc b/.config/patchagerc
deleted file mode 100644
index ff1a691..0000000
--- a/.config/patchagerc
+++ /dev/null
@@ -1,19 +0,0 @@
-window_location 0 0
-window_size 958 1174
-zoom_level 0.960316
-font_size 11
-show_toolbar 1
-sprung_layout 1
-module_position "Midi Through" input 587 147
-module_position "Midi Through" output 102 147
-module_position "a2j" input 490 6322
-module_position "a2j" output 8 4787
-module_position "ardour" inputoutput 519 2431.5
-module_position "firewire_pcm" input 353.351 259.03
-module_position "firewire_pcm" output 45 2551.5
-module_position "gx_head_amp" inputoutput 726.598 297.735
-module_position "gx_head_fx" inputoutput 836.681 368.929
-module_position "nanoKONTROL2" input 579 77
-module_position "nanoKONTROL2" output 94 77
-module_position "nanoPAD2" input 595 8
-module_position "nanoPAD2" output 110 8
diff --git a/.config/qtile/config.py b/.config/qtile/config.py
index 29c6c11..94f7629 100644
--- a/.config/qtile/config.py
+++ b/.config/qtile/config.py
@@ -27,7 +27,7 @@ audio_stop = home+"/bin/notify_mpd stop"
 
 subprocess.call(['feh',
                  '--bg-fill',
-                 home+'/ownCloud/photos/desktop/underwater_greenery.JPG'])
+                 home+'/ownCloud/photos/desktop/underwater_greenery.jpg'])
 
 colors = {
     "grey": "#555555",
@@ -140,7 +140,7 @@ matchers = {
         Match(wm_class=[
             re.compile('Processing'),
             re.compile('processing-app-Base'),
-            "scide",
+            re.compile('scide'),
             "pdwindow",
             "PdWindow",
             "PatchWindow",
@@ -237,22 +237,22 @@ layouts = [
         border_normal=colors["green"][1:],
         margin=1,
     ),
-    layout.TreeTab(
-        active_bg=colors["red"][1:],
-        #active_fg=colors["grey"][1:],
-        active_fg='ffffff',
-        inactive_bg=colors["green"][1:],
-        #inactive_fg=colors["lgrey"][1:],
-        inactive_fg='ffffff',
-        border_focus=colors["red"][1:],
-        border_normal=colors["green"][1:],
-        font='Monospace',
-        fontsize=14,
-        margin_left=0,
-        padding_left=0,
-        panel_width=100,
-        previous_on_rm=True,
-    ),
+#    layout.TreeTab(
+#        active_bg=colors["red"][1:],
+#        #active_fg=colors["grey"][1:],
+#        active_fg='ffffff',
+#        inactive_bg=colors["green"][1:],
+#        #inactive_fg=colors["lgrey"][1:],
+#        inactive_fg='ffffff',
+#        border_focus=colors["red"][1:],
+#        border_normal=colors["green"][1:],
+#        font='Monospace',
+#        fontsize=14,
+#        margin_left=0,
+#        padding_left=0,
+#        panel_width=100,
+#        previous_on_rm=True,
+#    ),
     layout.Stack(
         border_focus=colors["red"][1:],
         border_normal=colors["green"][1:],
@@ -288,10 +288,10 @@ screens = [
                 this_current_screen_border=colors["blue"]
             ),
             widget.Sep(),
-#            widget.Notify(
-#                foreground_low=colors["red"][1:],
-#                foreground_urgent=colors["red"][1:]
-#            ),
+            widget.Notify(
+                foreground_low=colors["red"][1:],
+                foreground_urgent=colors["red"][1:]
+            ),
             widget.Spacer(),
             widget.CurrentLayout(),
             widget.Sep(),
@@ -372,7 +372,7 @@ dgroups_key_binder = None
 dgroups_app_rules = []
 follow_mouse_focus = True
 bring_front_click = False
-cursor_warp = True
+cursor_warp = False
 floating_layout = layout.Floating()
 auto_fullscreen = True
 wmname = "LG3D"