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

* 'master' of https://github.com/davezerave/dot:
  Adding further ignores
  Adding khal settings to repository
  SuperCollider startup file for electronic studio
  Adding terminology settings directory
  Adding amSynth settings
  Adding settings file for baudline.
  Adding arduino settings
  Moving mpd ignores to .config/mpd
  Adding electronic studio setup
  Adding mpd.conf to .config/mpd/ directory
  Adding automatic symlinking of shotwell folder upon mount of photos harddrive
  Relocating .mpd directory to .config/mpd

12 files changed, 1367 insertions, 13 deletions

diff --git a/.amSynth.presets b/.amSynth.presets
new file mode 100644
index 0000000..f852b10
--- /dev/null
+++ b/.amSynth.presets
@@ -0,0 +1,964 @@
+amSynth
+<preset> <name> Derren 1
+<parameter> amp_attack 0.15
+<parameter> amp_decay 0.74009
+<parameter> amp_sustain 0.211222
+<parameter> amp_release 0.111362
+<parameter> osc1_waveform 1
+<parameter> filter_attack 6.95688e-09
+<parameter> filter_decay 1.1006
+<parameter> filter_sustain 0.232886
+<parameter> filter_release 0.33064
+<parameter> filter_resonance 0.917114
+<parameter> filter_env_amount 10.5934
+<parameter> filter_cutoff -0.358078
+<parameter> osc2_detune 0
+<parameter> osc2_waveform 1
+<parameter> master_vol 0.5229
+<parameter> lfo_freq 0.808204
+<parameter> lfo_waveform 0
+<parameter> osc2_range -1
+<parameter> osc_mix 0.20171
+<parameter> freq_mod_amount 0.251984
+<parameter> filter_mod_amount -0.228579
+<parameter> amp_mod_amount -0.416837
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.287752
+<parameter> osc2_pulsewidth 0.59915
+<parameter> reverb_roomsize 0.339957
+<parameter> reverb_damp 0.177191
+<parameter> reverb_wet 0.32997
+<parameter> reverb_width 0.979909
+<parameter> distortion_crunch 2.50448e-09
+<parameter> osc2_sync 1
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Synth Strings 1
+<parameter> amp_attack 0.960411
+<parameter> amp_decay 0.02
+<parameter> amp_sustain 1
+<parameter> amp_release 1
+<parameter> osc1_waveform 2
+<parameter> filter_attack 0.0195569
+<parameter> filter_decay 0.02
+<parameter> filter_sustain 1
+<parameter> filter_release 1.05095
+<parameter> filter_resonance 0.594336
+<parameter> filter_env_amount 0
+<parameter> filter_cutoff 0.851124
+<parameter> osc2_detune 0.011899
+<parameter> osc2_waveform 2
+<parameter> master_vol 0.955268
+<parameter> lfo_freq 2.38653
+<parameter> lfo_waveform 0
+<parameter> osc2_range 0
+<parameter> osc_mix 0.0127277
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -0.86315
+<parameter> amp_mod_amount -0.993575
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.788778
+<parameter> osc2_pulsewidth 0.83
+<parameter> reverb_roomsize 0.675502
+<parameter> reverb_damp 0.00193077
+<parameter> reverb_wet 0.0824253
+<parameter> reverb_width 0.477634
+<parameter> distortion_crunch 2.50448e-09
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Violin 1
+<parameter> amp_attack 0.391711
+<parameter> amp_decay 0.11
+<parameter> amp_sustain 0.85
+<parameter> amp_release 0.15
+<parameter> osc1_waveform 2
+<parameter> filter_attack 0.511366
+<parameter> filter_decay 0.02
+<parameter> filter_sustain 0.707847
+<parameter> filter_release 0.3
+<parameter> filter_resonance 0.530301
+<parameter> filter_env_amount 8.63406
+<parameter> filter_cutoff 0.736762
+<parameter> osc2_detune 6.70552e-07
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 2.25779
+<parameter> lfo_waveform 0
+<parameter> osc2_range 1
+<parameter> osc_mix -0.277557
+<parameter> freq_mod_amount 0.207631
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.954063
+<parameter> osc2_pulsewidth 0.682296
+<parameter> reverb_roomsize 0
+<parameter> reverb_damp 0
+<parameter> reverb_wet 0
+<parameter> reverb_width 0
+<parameter> distortion_crunch 1.49012e-08
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Sweet Bass
+<parameter> amp_attack 0.0591818
+<parameter> amp_decay 0.350065
+<parameter> amp_sustain 0.5
+<parameter> amp_release 0.868007
+<parameter> osc1_waveform 2
+<parameter> filter_attack 0
+<parameter> filter_decay 1.36265
+<parameter> filter_sustain 2.78275e-09
+<parameter> filter_release 1.04671
+<parameter> filter_resonance 0.897859
+<parameter> filter_env_amount 16
+<parameter> filter_cutoff 0.271993
+<parameter> osc2_detune 0
+<parameter> osc2_waveform 1
+<parameter> master_vol 0.603862
+<parameter> lfo_freq 1.76685
+<parameter> lfo_waveform 1
+<parameter> osc2_range -1
+<parameter> osc_mix -0.447776
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount 0.4229
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.451552
+<parameter> osc2_pulsewidth 0.0784359
+<parameter> reverb_roomsize 0.62
+<parameter> reverb_damp 0.571492
+<parameter> reverb_wet 0.5
+<parameter> reverb_width 0.994642
+<parameter> distortion_crunch 0.02
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Formant Synth Lead
+<parameter> amp_attack 0.465953
+<parameter> amp_decay 0.282384
+<parameter> amp_sustain 2.78275e-09
+<parameter> amp_release 0.322351
+<parameter> osc1_waveform 2
+<parameter> filter_attack 0.383031
+<parameter> filter_decay 1.33222
+<parameter> filter_sustain 2.78275e-09
+<parameter> filter_release 1.0589
+<parameter> filter_resonance 0.893929
+<parameter> filter_env_amount 16
+<parameter> filter_cutoff -0.265736
+<parameter> osc2_detune 0.0615489
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 0.864093
+<parameter> lfo_waveform 2
+<parameter> osc2_range 1
+<parameter> osc_mix 0
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -0.46097
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 1
+<parameter> osc2_pulsewidth 1
+<parameter> reverb_roomsize 0.741581
+<parameter> reverb_damp 0.557009
+<parameter> reverb_wet 0.078985
+<parameter> reverb_width 1
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 1
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Caves
+<parameter> amp_attack 1.67792
+<parameter> amp_decay 0.25158
+<parameter> amp_sustain 0.930628
+<parameter> amp_release 2.13689
+<parameter> osc1_waveform 2
+<parameter> filter_attack 1.20148
+<parameter> filter_decay 1.88466
+<parameter> filter_sustain 0.629477
+<parameter> filter_release 0.743643
+<parameter> filter_resonance 0.522167
+<parameter> filter_env_amount 8.74291
+<parameter> filter_cutoff 0.894262
+<parameter> osc2_detune 0.273525
+<parameter> osc2_waveform 4
+<parameter> master_vol 1
+<parameter> lfo_freq 7.41958
+<parameter> lfo_waveform 4
+<parameter> osc2_range 0
+<parameter> osc_mix -0.238359
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount 0.932784
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.63605
+<parameter> osc2_pulsewidth 0.694407
+<parameter> reverb_roomsize 0.943169
+<parameter> reverb_damp 0.767595
+<parameter> reverb_wet 0.566246
+<parameter> reverb_width 0.689255
+<parameter> distortion_crunch 0.619883
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Xylophone
+<parameter> amp_attack 0
+<parameter> amp_decay 0.529803
+<parameter> amp_sustain 2.78275e-09
+<parameter> amp_release 0.52916
+<parameter> osc1_waveform 0
+<parameter> filter_attack 0
+<parameter> filter_decay 0.536456
+<parameter> filter_sustain 2.78275e-09
+<parameter> filter_release 0.53
+<parameter> filter_resonance 2.78275e-09
+<parameter> filter_env_amount 9.23726
+<parameter> filter_cutoff -0.353677
+<parameter> osc2_detune 0
+<parameter> osc2_waveform 0
+<parameter> master_vol 1
+<parameter> lfo_freq 0
+<parameter> lfo_waveform 0
+<parameter> osc2_range 2
+<parameter> osc_mix 1
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.469297
+<parameter> osc2_pulsewidth 0.531541
+<parameter> reverb_roomsize 0.0457566
+<parameter> reverb_damp 0.150639
+<parameter> reverb_wet 0.179853
+<parameter> reverb_width 0.951605
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Electric Organ 1
+<parameter> amp_attack 0.17
+<parameter> amp_decay 0
+<parameter> amp_sustain 1
+<parameter> amp_release 0.17
+<parameter> osc1_waveform 1
+<parameter> filter_attack 0
+<parameter> filter_decay 0
+<parameter> filter_sustain 1
+<parameter> filter_release 0
+<parameter> filter_resonance 0.464052
+<parameter> filter_env_amount 0
+<parameter> filter_cutoff 0.324272
+<parameter> osc2_detune 0.01
+<parameter> osc2_waveform 0
+<parameter> master_vol 0.92
+<parameter> lfo_freq 1.0773
+<parameter> lfo_waveform 2
+<parameter> osc2_range 0
+<parameter> osc_mix 0.0246093
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -0.874988
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 2.78275e-09
+<parameter> osc2_pulsewidth 0
+<parameter> reverb_roomsize 0.660043
+<parameter> reverb_damp 0
+<parameter> reverb_wet 0.0205412
+<parameter> reverb_width 0.991763
+<parameter> distortion_crunch 1.49012e-08
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Church Organ
+<parameter> amp_attack 0.17
+<parameter> amp_decay 0
+<parameter> amp_sustain 1
+<parameter> amp_release 0.17
+<parameter> osc1_waveform 1
+<parameter> filter_attack 0
+<parameter> filter_decay 0
+<parameter> filter_sustain 1
+<parameter> filter_release 0
+<parameter> filter_resonance 0.427329
+<parameter> filter_env_amount 0
+<parameter> filter_cutoff 0.603278
+<parameter> osc2_detune 0.04
+<parameter> osc2_waveform 0
+<parameter> master_vol 0.546404
+<parameter> lfo_freq 1.04254
+<parameter> lfo_waveform 2
+<parameter> osc2_range -1
+<parameter> osc_mix 0.0246093
+<parameter> freq_mod_amount 0.01
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -0.764157
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.785879
+<parameter> osc2_pulsewidth 0
+<parameter> reverb_roomsize 0.785879
+<parameter> reverb_damp 1
+<parameter> reverb_wet 0.115122
+<parameter> reverb_width 0.972108
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Reed Organ
+<parameter> amp_attack 0.17
+<parameter> amp_decay 0
+<parameter> amp_sustain 1
+<parameter> amp_release 0.17
+<parameter> osc1_waveform 1
+<parameter> filter_attack 0
+<parameter> filter_decay 0
+<parameter> filter_sustain 1
+<parameter> filter_release 0
+<parameter> filter_resonance 0.763715
+<parameter> filter_env_amount 0
+<parameter> filter_cutoff 0.706986
+<parameter> osc2_detune 0.04
+<parameter> osc2_waveform 0
+<parameter> master_vol 0.546404
+<parameter> lfo_freq 1.04254
+<parameter> lfo_waveform 2
+<parameter> osc2_range -1
+<parameter> osc_mix 0.0246093
+<parameter> freq_mod_amount 0.01
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -0.764157
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.785879
+<parameter> osc2_pulsewidth 0
+<parameter> reverb_roomsize 0.785879
+<parameter> reverb_damp 1
+<parameter> reverb_wet 0.115122
+<parameter> reverb_width 0.972108
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Sexy Boy
+<parameter> amp_attack 0.01
+<parameter> amp_decay 1.92115
+<parameter> amp_sustain 2.78275e-09
+<parameter> amp_release 0.39645
+<parameter> osc1_waveform 2
+<parameter> filter_attack 6.95688e-09
+<parameter> filter_decay 1.94992
+<parameter> filter_sustain 2.78275e-09
+<parameter> filter_release 0.964041
+<parameter> filter_resonance 0.878329
+<parameter> filter_env_amount 16
+<parameter> filter_cutoff -0.329533
+<parameter> osc2_detune 0
+<parameter> osc2_waveform 1
+<parameter> master_vol 0.54167
+<parameter> lfo_freq 1.7625
+<parameter> lfo_waveform 1
+<parameter> osc2_range -1
+<parameter> osc_mix -0.447776
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.451552
+<parameter> osc2_pulsewidth 0.0784359
+<parameter> reverb_roomsize 0.628866
+<parameter> reverb_damp 0.35
+<parameter> reverb_wet 0.343417
+<parameter> reverb_width 1
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Flangey Bass 1
+<parameter> amp_attack 0.148853
+<parameter> amp_decay 0.918287
+<parameter> amp_sustain 0.610371
+<parameter> amp_release 0.313828
+<parameter> osc1_waveform 1
+<parameter> filter_attack 0.536656
+<parameter> filter_decay 0.811711
+<parameter> filter_sustain 2.78275e-09
+<parameter> filter_release 0.51
+<parameter> filter_resonance 0.814662
+<parameter> filter_env_amount 16
+<parameter> filter_cutoff 0.420799
+<parameter> osc2_detune 0.0500005
+<parameter> osc2_waveform 1
+<parameter> master_vol 1
+<parameter> lfo_freq 2.08707e-08
+<parameter> lfo_waveform 0
+<parameter> osc2_range 0
+<parameter> osc_mix 0.109264
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0
+<parameter> osc2_pulsewidth 0
+<parameter> reverb_roomsize 0.857009
+<parameter> reverb_damp 0.919699
+<parameter> reverb_wet 0.11453
+<parameter> reverb_width 0.980541
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> My Friend
+<parameter> amp_attack 0.17
+<parameter> amp_decay 0
+<parameter> amp_sustain 1
+<parameter> amp_release 0.412571
+<parameter> osc1_waveform 1
+<parameter> filter_attack 0
+<parameter> filter_decay 0
+<parameter> filter_sustain 1
+<parameter> filter_release 0
+<parameter> filter_resonance 0.544135
+<parameter> filter_env_amount 0
+<parameter> filter_cutoff 0.440235
+<parameter> osc2_detune -0.00763828
+<parameter> osc2_waveform 2
+<parameter> master_vol 0.504732
+<parameter> lfo_freq 1.0773
+<parameter> lfo_waveform 2
+<parameter> osc2_range 0
+<parameter> osc_mix 0.752224
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -0.874988
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.93233
+<parameter> osc2_pulsewidth 2.78275e-09
+<parameter> reverb_roomsize 0.660043
+<parameter> reverb_damp 0
+<parameter> reverb_wet 0.0166401
+<parameter> reverb_width 0.991763
+<parameter> distortion_crunch 2.50448e-09
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Lazy Moon Lead
+<parameter> amp_attack 0
+<parameter> amp_decay 0.64
+<parameter> amp_sustain 0.944545
+<parameter> amp_release 0.58
+<parameter> osc1_waveform 2
+<parameter> filter_attack 0.19
+<parameter> filter_decay 0.721678
+<parameter> filter_sustain 2.78275e-09
+<parameter> filter_release 0.493298
+<parameter> filter_resonance 0.61918
+<parameter> filter_env_amount 11.6103
+<parameter> filter_cutoff 0.386277
+<parameter> osc2_detune 0
+<parameter> osc2_waveform 2
+<parameter> master_vol 0.421929
+<parameter> lfo_freq 2.08707e-08
+<parameter> lfo_waveform 2
+<parameter> osc2_range 0
+<parameter> osc_mix 0.0784552
+<parameter> freq_mod_amount 3.50605e-09
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.95
+<parameter> osc2_pulsewidth 0.913866
+<parameter> reverb_roomsize 0.511921
+<parameter> reverb_damp 0
+<parameter> reverb_wet 2.78275e-09
+<parameter> reverb_width 0
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> BubbleBath
+<parameter> amp_attack 0.594498
+<parameter> amp_decay 0.377137
+<parameter> amp_sustain 2.78275e-09
+<parameter> amp_release 0.423647
+<parameter> osc1_waveform 2
+<parameter> filter_attack 0.621376
+<parameter> filter_decay 6.95688e-09
+<parameter> filter_sustain 1
+<parameter> filter_release 0.425709
+<parameter> filter_resonance 0.935028
+<parameter> filter_env_amount 16
+<parameter> filter_cutoff -0.2
+<parameter> osc2_detune 0.01
+<parameter> osc2_waveform 1
+<parameter> master_vol 0.470001
+<parameter> lfo_freq 0
+<parameter> lfo_waveform 0
+<parameter> osc2_range 0
+<parameter> osc_mix -0.103494
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 1
+<parameter> osc2_pulsewidth 0.947062
+<parameter> reverb_roomsize 0.618459
+<parameter> reverb_damp 0
+<parameter> reverb_wet 0.214121
+<parameter> reverb_width 1
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Cosmonic
+<parameter> amp_attack 1.18408
+<parameter> amp_decay 0.840999
+<parameter> amp_sustain 0.139107
+<parameter> amp_release 1.05476
+<parameter> osc1_waveform 4
+<parameter> filter_attack 1.24032
+<parameter> filter_decay 0.767937
+<parameter> filter_sustain 0.0471062
+<parameter> filter_release 0.883595
+<parameter> filter_resonance 0.636697
+<parameter> filter_env_amount 3.66455
+<parameter> filter_cutoff 0.639928
+<parameter> osc2_detune -0.513336
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 4.61906
+<parameter> lfo_waveform 0
+<parameter> osc2_range 2
+<parameter> osc_mix 0.770227
+<parameter> freq_mod_amount 1.07907
+<parameter> filter_mod_amount 0.996136
+<parameter> amp_mod_amount -0.967442
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.442048
+<parameter> osc2_pulsewidth 0.729531
+<parameter> reverb_roomsize 0.106133
+<parameter> reverb_damp 0.532089
+<parameter> reverb_wet 0.436212
+<parameter> reverb_width 0.00140755
+<parameter> distortion_crunch 0.387434
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Cosmonic 2
+<parameter> amp_attack 1.18408
+<parameter> amp_decay 0.840999
+<parameter> amp_sustain 0.139107
+<parameter> amp_release 1.05476
+<parameter> osc1_waveform 4
+<parameter> filter_attack 1.24032
+<parameter> filter_decay 0.767937
+<parameter> filter_sustain 0.0471062
+<parameter> filter_release 0.883595
+<parameter> filter_resonance 0.604765
+<parameter> filter_env_amount 6.5832
+<parameter> filter_cutoff 0.639928
+<parameter> osc2_detune 0.9
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 5.84977
+<parameter> lfo_waveform 0
+<parameter> osc2_range 2
+<parameter> osc_mix 0.6
+<parameter> freq_mod_amount 1.13501
+<parameter> filter_mod_amount 0.996136
+<parameter> amp_mod_amount 0.918175
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.4352
+<parameter> osc2_pulsewidth 0.628866
+<parameter> reverb_roomsize 0.106133
+<parameter> reverb_damp 0.532089
+<parameter> reverb_wet 0.754765
+<parameter> reverb_width 0.554632
+<parameter> distortion_crunch 0.366566
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Deeck
+<parameter> amp_attack 0.252126
+<parameter> amp_decay 0.934375
+<parameter> amp_sustain 0.467114
+<parameter> amp_release 0
+<parameter> osc1_waveform 0
+<parameter> filter_attack 0.616969
+<parameter> filter_decay 1.30008
+<parameter> filter_sustain 0.574163
+<parameter> filter_release 0.25626
+<parameter> filter_resonance 0.877329
+<parameter> filter_env_amount 11.6666
+<parameter> filter_cutoff -0.310832
+<parameter> osc2_detune -0.584729
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 0.474773
+<parameter> lfo_waveform 0
+<parameter> osc2_range 1
+<parameter> osc_mix 0
+<parameter> freq_mod_amount 0.121945
+<parameter> filter_mod_amount 0.106303
+<parameter> amp_mod_amount -0.0200853
+<parameter> osc_mix_mode 1
+<parameter> osc1_pulsewidth 0.181575
+<parameter> osc2_pulsewidth 0.863419
+<parameter> reverb_roomsize 0.850228
+<parameter> reverb_damp 0.783434
+<parameter> reverb_wet 0.244986
+<parameter> reverb_width 0.343841
+<parameter> distortion_crunch 0.153213
+<parameter> osc2_sync 1
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Encounter
+<parameter> amp_attack 0.158258
+<parameter> amp_decay 0.693322
+<parameter> amp_sustain 0.186849
+<parameter> amp_release 0.918287
+<parameter> osc1_waveform 1
+<parameter> filter_attack 1.20859
+<parameter> filter_decay 1.14779
+<parameter> filter_sustain 0.442991
+<parameter> filter_release 1.30938
+<parameter> filter_resonance 0.145799
+<parameter> filter_env_amount 9.4168
+<parameter> filter_cutoff 0.237552
+<parameter> osc2_detune 0.0131663
+<parameter> osc2_waveform 0
+<parameter> master_vol 1
+<parameter> lfo_freq 2.27409
+<parameter> lfo_waveform 2
+<parameter> osc2_range 0
+<parameter> osc_mix 0
+<parameter> freq_mod_amount 0.0896232
+<parameter> filter_mod_amount 0.13704
+<parameter> amp_mod_amount -0.5525
+<parameter> osc_mix_mode 1
+<parameter> osc1_pulsewidth 0.4729
+<parameter> osc2_pulsewidth 0.408157
+<parameter> reverb_roomsize 0.50707
+<parameter> reverb_damp 0.530301
+<parameter> reverb_wet 0.470846
+<parameter> reverb_width 0.492365
+<parameter> distortion_crunch 2.78275e-09
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Glassic
+<parameter> amp_attack 0.161656
+<parameter> amp_decay 0
+<parameter> amp_sustain 1
+<parameter> amp_release 0
+<parameter> osc1_waveform 0
+<parameter> filter_attack 0.946797
+<parameter> filter_decay 0.7916
+<parameter> filter_sustain 0.58855
+<parameter> filter_release 1.01752
+<parameter> filter_resonance 0.306685
+<parameter> filter_env_amount 12.1724
+<parameter> filter_cutoff 0.795467
+<parameter> osc2_detune 0
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 0
+<parameter> lfo_waveform 0
+<parameter> osc2_range 2
+<parameter> osc_mix 0.102814
+<parameter> freq_mod_amount 0
+<parameter> filter_mod_amount -1
+<parameter> amp_mod_amount -1
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.59915
+<parameter> osc2_pulsewidth 0.341702
+<parameter> reverb_roomsize 0
+<parameter> reverb_damp 0
+<parameter> reverb_wet 0
+<parameter> reverb_width 0
+<parameter> distortion_crunch 0
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Periodic Junk
+<parameter> amp_attack 1.10748
+<parameter> amp_decay 1.3855
+<parameter> amp_sustain 0.549145
+<parameter> amp_release 0.70646
+<parameter> osc1_waveform 2
+<parameter> filter_attack 1.22195
+<parameter> filter_decay 0.77421
+<parameter> filter_sustain 0.280759
+<parameter> filter_release 0.758031
+<parameter> filter_resonance 0.836285
+<parameter> filter_env_amount 1.90376
+<parameter> filter_cutoff 0.0692091
+<parameter> osc2_detune 0.3
+<parameter> osc2_waveform 0
+<parameter> master_vol 1
+<parameter> lfo_freq 2.03427
+<parameter> lfo_waveform 0
+<parameter> osc2_range -1
+<parameter> osc_mix -0.0200853
+<parameter> freq_mod_amount 0.167045
+<parameter> filter_mod_amount -0.506425
+<parameter> amp_mod_amount 0.506425
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.427329
+<parameter> osc2_pulsewidth 0.328866
+<parameter> reverb_roomsize 0.58855
+<parameter> reverb_damp 0.267416
+<parameter> reverb_wet 0.451766
+<parameter> reverb_width 0.608731
+<parameter> distortion_crunch 0.108641
+<parameter> osc2_sync 1
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Soft Simple
+<parameter> amp_attack 1.15929
+<parameter> amp_decay 1.38035
+<parameter> amp_sustain 0.563645
+<parameter> amp_release 1.58834
+<parameter> osc1_waveform 1
+<parameter> filter_attack 1.20859
+<parameter> filter_decay 1.14779
+<parameter> filter_sustain 0.442991
+<parameter> filter_release 1.30938
+<parameter> filter_resonance 0.140851
+<parameter> filter_env_amount 9.05594
+<parameter> filter_cutoff 0.261013
+<parameter> osc2_detune 0.068699
+<parameter> osc2_waveform 1
+<parameter> master_vol 1
+<parameter> lfo_freq 3.8295
+<parameter> lfo_waveform 2
+<parameter> osc2_range 0
+<parameter> osc_mix 0
+<parameter> freq_mod_amount 0.120685
+<parameter> filter_mod_amount -0.65618
+<parameter> amp_mod_amount 0
+<parameter> osc_mix_mode 1
+<parameter> osc1_pulsewidth 0.519687
+<parameter> osc2_pulsewidth 0.408157
+<parameter> reverb_roomsize 0.50707
+<parameter> reverb_damp 0.530301
+<parameter> reverb_wet 0.470846
+<parameter> reverb_width 0.492365
+<parameter> distortion_crunch 0.129875
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Vibratio
+<parameter> amp_attack 0.158258
+<parameter> amp_decay 0.693322
+<parameter> amp_sustain 0.186849
+<parameter> amp_release 0.918287
+<parameter> osc1_waveform 1
+<parameter> filter_attack 1.20859
+<parameter> filter_decay 1.14779
+<parameter> filter_sustain 0.442991
+<parameter> filter_release 1.30938
+<parameter> filter_resonance 0.91664
+<parameter> filter_env_amount 15.3795
+<parameter> filter_cutoff 0.237552
+<parameter> osc2_detune -0.0173503
+<parameter> osc2_waveform 0
+<parameter> master_vol 1
+<parameter> lfo_freq 0.640491
+<parameter> lfo_waveform 2
+<parameter> osc2_range 0
+<parameter> osc_mix 0.44025
+<parameter> freq_mod_amount 0.0719041
+<parameter> filter_mod_amount 0.13704
+<parameter> amp_mod_amount -0.1229
+<parameter> osc_mix_mode 1
+<parameter> osc1_pulsewidth 0.4729
+<parameter> osc2_pulsewidth 0.509088
+<parameter> reverb_roomsize 0.50707
+<parameter> reverb_damp 0.530301
+<parameter> reverb_wet 0.470846
+<parameter> reverb_width 0.492365
+<parameter> distortion_crunch 2.78275e-09
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Wave
+<parameter> amp_attack 0.752137
+<parameter> amp_decay 0.898853
+<parameter> amp_sustain 0.354657
+<parameter> amp_release 1.27075
+<parameter> osc1_waveform 3
+<parameter> filter_attack 0.875
+<parameter> filter_decay 0.831713
+<parameter> filter_sustain 0.5
+<parameter> filter_release 1.81195
+<parameter> filter_resonance 0.431791
+<parameter> filter_env_amount 0.150695
+<parameter> filter_cutoff 0.581686
+<parameter> osc2_detune -0.133221
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 0.40993
+<parameter> lfo_waveform 0
+<parameter> osc2_range 2
+<parameter> osc_mix 0.358308
+<parameter> freq_mod_amount 0.273799
+<parameter> filter_mod_amount -0.15975
+<parameter> amp_mod_amount -0.320085
+<parameter> osc_mix_mode 1
+<parameter> osc1_pulsewidth 0.486381
+<parameter> osc2_pulsewidth 0.300855
+<parameter> reverb_roomsize 0.779973
+<parameter> reverb_damp 0.553151
+<parameter> reverb_wet 0.0280135
+<parameter> reverb_width 0.430614
+<parameter> distortion_crunch 0.0534721
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Artic
+<parameter> amp_attack 0.576081
+<parameter> amp_decay 1.19447
+<parameter> amp_sustain 0.316166
+<parameter> amp_release 2.06007
+<parameter> osc1_waveform 0
+<parameter> filter_attack 1.2606
+<parameter> filter_decay 2.49172
+<parameter> filter_sustain 0.966529
+<parameter> filter_release 0.804126
+<parameter> filter_resonance 0.157868
+<parameter> filter_env_amount 10.5769
+<parameter> filter_cutoff -0.393938
+<parameter> osc2_detune -0.171913
+<parameter> osc2_waveform 2
+<parameter> master_vol 1
+<parameter> lfo_freq 1.3676
+<parameter> lfo_waveform 2
+<parameter> osc2_range 1
+<parameter> osc_mix 0.88311
+<parameter> freq_mod_amount 0.226119
+<parameter> filter_mod_amount -0.127432
+<parameter> amp_mod_amount 0.293271
+<parameter> osc_mix_mode 1
+<parameter> osc1_pulsewidth 0.565404
+<parameter> osc2_pulsewidth 0.39667
+<parameter> reverb_roomsize 0.995892
+<parameter> reverb_damp 0.966247
+<parameter> reverb_wet 0.388953
+<parameter> reverb_width 0.19668
+<parameter> distortion_crunch 0.0186385
+<parameter> osc2_sync 1
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+<preset> <name> Dirty Pulsating Bass
+<parameter> amp_attack 0.177835
+<parameter> amp_decay 0
+<parameter> amp_sustain 1
+<parameter> amp_release 0.313499
+<parameter> osc1_waveform 1
+<parameter> filter_attack 0.9584
+<parameter> filter_decay 0
+<parameter> filter_sustain 1
+<parameter> filter_release 0.383031
+<parameter> filter_resonance 0.790223
+<parameter> filter_env_amount -0.60913
+<parameter> filter_cutoff 0.7246
+<parameter> osc2_detune -0.985579
+<parameter> osc2_waveform 1
+<parameter> master_vol 0.551537
+<parameter> lfo_freq 2.94987
+<parameter> lfo_waveform 0
+<parameter> osc2_range -1
+<parameter> osc_mix 0.342268
+<parameter> freq_mod_amount 3.50605e-09
+<parameter> filter_mod_amount -0.014684
+<parameter> amp_mod_amount 0.303265
+<parameter> osc_mix_mode 0
+<parameter> osc1_pulsewidth 0.673177
+<parameter> osc2_pulsewidth 2.78275e-09
+<parameter> reverb_roomsize 0.0544407
+<parameter> reverb_damp 0.975315
+<parameter> reverb_wet 2.78275e-09
+<parameter> reverb_width 2.78275e-09
+<parameter> distortion_crunch 0.310438
+<parameter> osc2_sync 0
+<parameter> portamento_time 0
+<parameter> keyboard_mode 0
+<parameter> osc2_pitch 0
+<parameter> filter_type 0
+<parameter> filter_slope 1
+EOF
diff --git a/.amSynthrc b/.amSynthrc
new file mode 100644
index 0000000..decccad
--- /dev/null
+++ b/.amSynthrc
@@ -0,0 +1,9 @@
+midi_driver	auto
+oss_midi_device	/dev/midi
+midi_channel	0
+audio_driver	auto
+oss_audio_device	/dev/dsp
+alsa_audio_device	default
+sample_rate	44100
+polyphony	16
+pitch_bend_range	2
diff --git a/.arduino/preferences.txt b/.arduino/preferences.txt
new file mode 100644
index 0000000..48522b4
--- /dev/null
+++ b/.arduino/preferences.txt
@@ -0,0 +1,77 @@
+board=nano328
+browser=mozilla
+browser.linux=mozilla
+console=true
+console.auto_clear=true
+console.error.file=stderr.txt
+console.length=500
+console.lines=4
+console.output.file=stdout.txt
+editor.antialias=false
+editor.caret.blink=true
+editor.divider.size=0
+editor.divider.size.windows=2
+editor.external=false
+editor.font=Monospaced,plain,12
+editor.font.macosx=Monaco,plain,10
+editor.indent=true
+editor.invalid=false
+editor.keys.alternative_cut_copy_paste=true
+editor.keys.alternative_cut_copy_paste.macosx=false
+editor.keys.home_and_end_travel_far=false
+editor.keys.home_and_end_travel_far.macosx=true
+editor.keys.shift_backspace_is_delete=true
+editor.languages.current=
+editor.tabs.expand=true
+editor.tabs.size=2
+editor.window.height.default=600
+editor.window.height.min=290
+editor.window.width.default=500
+editor.window.width.min=400
+export.applet.separate_jar_files=false
+export.application.fullscreen=false
+export.application.platform=true
+export.application.platform.linux=true
+export.application.platform.macosx=true
+export.application.platform.windows=true
+export.application.stop=true
+export.delete_target_folder=true
+last.screen.height=1080
+last.screen.width=1920
+last.serial.location=961,25,958,1054
+last.sketch.count=1
+last.sketch0.location=0,0,1918,1054,909
+last.sketch0.path=/home/dave/sketchbook/nano_read_preamp/nano_read_preamp.ino
+launcher=xdg-open
+platform.auto_file_type_associations=true
+preproc.color_datatype=true
+preproc.enhanced_casting=true
+preproc.imports.list=java.applet.*,java.awt.Dimension,java.awt.Frame,java.awt.event.MouseEvent,java.awt.event.KeyEvent,java.awt.event.FocusEvent,java.awt.Image,java.io.*,java.net.*,java.text.*,java.util.*,java.util.zip.*,java.util.regex.*
+preproc.output_parse_tree=false
+preproc.save_build_files=false
+preproc.substitute_floats=true
+preproc.substitute_unicode=true
+preproc.web_colors=true
+programmer=arduino:avrispmkii
+run.display=1
+run.options=
+run.options.memory=false
+run.options.memory.initial=64
+run.options.memory.maximum=256
+run.present.bgcolor=#666666
+run.present.exclusive=false
+run.present.exclusive.macosx=true
+run.present.stop.color=#cccccc
+run.window.bgcolor=#DFDFDF
+serial.databits=8
+serial.debug_rate=57600
+serial.parity=N
+serial.port=/dev/ttyUSB0
+serial.stopbits=1
+sketchbook.path=/home/dave/sketchbook
+target=arduino
+update.check=true
+update.id=7646775108848557509
+update.last=1404988647537
+upload.using=bootloader
+upload.verify=true
diff --git a/.autorandr/multi-plugged-studio/config b/.autorandr/multi-plugged-studio/config
new file mode 100644
index 0000000..3272660
--- /dev/null
+++ b/.autorandr/multi-plugged-studio/config
@@ -0,0 +1,17 @@
+output eDP1
+mode 1920x1080
+pos 0x0
+output VGA1
+off
+output DP1
+off
+output HDMI1
+primary
+mode 1920x1200
+pos 1920x0
+output DP2
+off
+output HDMI2
+off
+output VIRTUAL1
+off
diff --git a/.autorandr/multi-plugged-studio/setup b/.autorandr/multi-plugged-studio/setup
new file mode 100644
index 0000000..19d68d0
--- /dev/null
+++ b/.autorandr/multi-plugged-studio/setup
@@ -0,0 +1,2 @@
+eDP1 00ffffffffffff0006afed3400000000001601049522137802d1159e59539b271e505400000001010101010101010101010101010101b03680b470381e403064310058c1100000180000000f0000000000000000000000000020000000fe0041554f0a202020202020202020000000fe004231353648544e30332e34200a00f6
+HDMI1 00ffffffffffff004c2d87053736535a18150103803420782aee91a3544c99260f5054230800a9408180814081009500b30001010101283c80a070b023403020360006442100001a000000fd00323f1e5111000a202020202020000000fc0053796e634d61737465720a2020000000ff00484d42423630343539340a202001b102010400023a801871382d40582c450006442100001e023a80d072382d40102c458006442100001e011d007251d01e206e28550006442100001e011d00bc52d01e20b828554006442100001e8c0ad090204031200c4055000644210000188c0ad08a20e02d10103e960006442100001800000000000000000000000000000096
diff --git a/.baudline/baudline_rc b/.baudline/baudline_rc
new file mode 100644
index 0000000..81eab48
--- /dev/null
+++ b/.baudline/baudline_rc
@@ -0,0 +1,93 @@
+pause
+memory 42
+fftsize 2048
+slidesize 384
+samplerate 44100.000000
+inchannels 1
+outchannels 2
+spectrum_w_divisions 108
+Hz_reduction 1
+average.geometry 1920x410-1-1
+average.zoom 1x1+0+0
+histogram.geometry 512x256-1-1
+histogram.zoom 7x1+0+0
+spectro.geometry 1024x1031+0+24
+spectro.zoom 1x1+0+0
+waveform.geometry 1920x180-1-1
+waveform.zoom 1x1+302784+0
+inputdevices.geometry +0+0
+playdeck.lpf 768
+playdeck.hpf 256
+file.open.lines 15
+file.open.option_value 0
+file.save.lines 15
+file.average.lines 15
+file.equalization.lines 15
+average.timer 0
+average.last_bank 11
+average.duration 60
+coloraperture.upper 0
+coloraperture.lower -136
+driftintegrator.beamslices 0
+driftintegrator.driftrate 0
+driftintegrator.increment 1000
+driftintegrator.optimumoverlap 1
+driftintegrator.limiter 1000
+driftintegrator.paste_algorithm 0
+driftintegrator.auto_drift_quality 1
+equalization.type 0
+equalization.alpha 100
+equalization.level 0
+histogram.decay 0
+measurements.bin_start 0
+measurements.bin_end 32768
+windowing.type 5
+windowing.beta 600
+color.mono 4
+color.left 1
+color.right 3
+color.r 0
+color.g 1
+color.b 2
+color.0.0.0 0
+color.0.0.1 0
+color.0.0.2 0
+color.0.1.0 512
+color.0.1.1 512
+color.0.1.2 512
+color.0.ops 0
+color.0.map 0
+color.0.palette 9
+color.1.0.0 80
+color.1.0.1 0
+color.1.0.2 -40
+color.1.1.0 512
+color.1.1.1 340
+color.1.1.2 512
+color.1.ops 0
+color.1.map 0
+color.1.palette 0
+color.2.0.0 75
+color.2.0.1 96
+color.2.0.2 42
+color.2.1.0 366
+color.2.1.1 255
+color.2.1.2 499
+color.2.ops 8
+color.2.map 5
+color.2.palette 5
+tone.f.type 1
+tone.f.main_frequency 72000
+tone.f.lower_frequency 20000
+tone.f.upper_frequency 90000
+tone.m.type 0
+tone.m.f.type 1
+tone.m.f.frequency 372
+tone.m.amplitude_depth 90
+tone.m.pulse_duration 100
+tone.m.sweep_duration 1000
+tone.m.positive_phase 1
+tone.m.up_direction 1
+tone.m.exponential_sweep 0
+tone.dual_channel_mode 2
+tone.digital_gain_dB -20
diff --git a/.config/SuperCollider/startupfiles/electronicStudio.scd b/.config/SuperCollider/startupfiles/electronicStudio.scd
new file mode 100644
index 0000000..b37b732
--- /dev/null
+++ b/.config/SuperCollider/startupfiles/electronicStudio.scd
@@ -0,0 +1,49 @@
+//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/khal/khal.conf b/.config/khal/khal.conf
new file mode 100644
index 0000000..57a63e0
--- /dev/null
+++ b/.config/khal/khal.conf
@@ -0,0 +1,125 @@
+#/etc/khal/khal.conf.sample
+#
+# The default configuration file locations are:
+# ~/.khal/khal.conf
+# ~/.config/khal/khal.conf
+#
+# In this file you need to specify:
+# - CalDAV Account settings
+# - khal SQLite3 Database settings
+# - Timezone and Time Display Formating Interface settings
+# - Debug level
+#
+# Look at the end of this file for an example config.
+#------------------------------------------------------------------------------
+# ## CalDAV Account Configuration ##
+#------------------------------------------------------------------------------
+# [Calendar home]
+# # Each  calendar configuration must start with a Calendar tag
+# # Each Calendar Tag must be unique.
+#
+# path: ~/.khal/calendars/home/
+# # Specify the location of the vdir
+#
+#
+# color: dark blue
+# # Set the color for this calendar
+# # If color is not set, events will be in your default terminal color
+# #   * Colors may not be what you expect by their name.
+# #   * Your terminal's terminfo and termcap define these values.
+# #
+# # Supported color names:
+# # 'black' 'white' 'brown' 'yellow'
+# # 'dark grey' 'dark green' 'dark blue'
+# # 'light grey' 'light green' 'light blue'
+# # 'dark magenta' 'dark cyan' 'dark red' 
+# # 'light magenta' 'light cyan''light red' 
+#
+#------------------------------------------------------------------------------
+# ## khal SQLite3 Database Configuration ##
+#------------------------------------------------------------------------------
+#
+# [sqlite]
+# # This configuration file must have a [sqlite] Tag
+# 
+# path: ~/.khal/khal.db
+# # This specifies the location of the khal SQLite3 Database file
+# #   * Default: ~/.local/share/khal/khal.db
+#
+#------------------------------------------------------------------------------
+# ## Time Zone and Time Display Formating Configuration ##
+#------------------------------------------------------------------------------
+#
+# [default]
+# # This configuration file must have a [default] Tag
+#
+# local_timezone: Pacific/Honolulu
+# # Set the Local Timezone
+# #   * All date are shown in the Local Timezone
+#
+# default_timezone: Pacific/Honolulu
+# # Set the Default Timezone
+# # The Default Timezone is used for new events added via khal --new
+# # It is also used if vCal datetime's timezone is not understood
+# #
+#
+# timeformat: %H:%M
+# dateformat: %m-%d
+# longdateformat: %Y-%m-%d
+# datetimeformat: %m-%d %H:%M
+# longdatetimeformat: %Y-%m-%d %H:%M
+# # Set the format Time and Date should be displayed in by khal
+# #   * Long version should contain the current year
+# #
+# # Specify date/time in standard strftime format
+# # http://strftime.net/
+# #   * Example date in ISO-8601 format, "American"
+#
+# encoding: utf-8
+# # Enable UTF-8 encoding
+# #   * Set this if your terminal is using to utf-8
+#
+# unicode_symbols: True
+# # Enable unicode symbols to display event properties
+# # Set this to False if your terminal's character set dose not support them
+# #   * Default: True
+#
+# firstweekday: 6
+# # Set the first day of the week, 0 is Monday, 6 is Sunday
+#
+#------------------------------------------------------------------------------
+# ## Debug Level ##
+#------------------------------------------------------------------------------
+#
+# DEBUG: 0
+# # Specify the Default Debug level (only 0 and 1 are supported at the moment)
+# 
+
+
+##
+## Example Configuration
+##
+[Calendar home]
+path: ~/.khal/calendars/home/
+color: dark blue
+
+[Calendar work]
+path: ~/.khal/calendars/work/
+readonly: True
+
+[sqlite]
+path: ~/.khal/khal.db
+
+[default]
+local_timezone: Europe/Berlin
+default_timezone: America/New_York
+
+timeformat: %H:%M
+dateformat: %d.%m.
+longdateformat: %d.%m.%Y
+datetimeformat: %d.%m. %H:%M
+longdatetimeformat: %d.%m.%Y %H:%M
+
+firstweekday: 0
+
+DEBUG: 0
diff --git a/.mpd/mpd.conf b/.config/mpd/mpd.conf
index 4d820e1..aa1a2a6 100644
--- a/.mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -1,9 +1,9 @@
-music_directory "/home/dave/.mpd/folders"
-playlist_directory "/home/dave/.mpd/playlists"
-db_file "/home/dave/.mpd/mpd.db"
-log_file "/home/dave/.mpd/mpd.log"
-pid_file "/home/dave/.mpd/mpd.pid"
-state_file "/home/dave/.mpd/mpdstate"
+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"
 bind_to_address "::"
 port "6600"
diff --git a/.config/terminology/config/standard/base.cfg b/.config/terminology/config/standard/base.cfg
new file mode 100644
index 0000000..24826c2
--- /dev/null
+++ b/.config/terminology/config/standard/base.cfg
diff --git a/.gitignore b/.gitignore
index ba930dd..ca07228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,7 @@ svn/
 .config/guitarix/
 .config/htop/
 .config/ibus/
+.config/icedtea-web/
 .config/inkscape/
 .config/ipython/
 .config/jack/
@@ -118,6 +119,14 @@ svn/
 .config/libreoffice/
 .config/lxterminal/
 .config/mate/
+.config/mpd/folders/
+.config/mpd/mpd.db
+.config/mpd/mpd.log
+.config/mpd/mpd.pid
+.config/mpd/mpdstate
+.config/mpd/playlists/
+.config/mpd/sticker.sql
+.config/menus/
 .config/nautilus-actions/
 .config/nautilus/
 .config/octave/
@@ -130,6 +139,7 @@ svn/
 .config/rubyripper/
 .config/sound-juicer/
 .config/synergy-dvzrv.conf
+.config/systemd/
 .config/termite/.asound.conf
 .config/tint2/
 .config/user-dirs.locale
@@ -144,9 +154,12 @@ svn/
 .dmrc
 .docear/
 .dropbox-dist/
+.dropbox-master/
 .dropbox/
 .dvdcss/
+.dvdrip*
 .editrc
+.electrum/
 .escaped_colors.rb
 .esd_auth
 .envtab
@@ -195,6 +208,7 @@ svn/
 .jdownloader/
 .kde4/
 .keychain/
+.khal/
 .lesshst
 .lfm_history
 .lives
@@ -207,6 +221,7 @@ svn/
 .local/share/birdie/
 .local/share/comix/
 .local/share/data/
+.local/share/fontconfig/
 .local/share/gegl-0.1/
 .local/share/gegl-0.2/
 .local/share/goobox/
@@ -221,6 +236,7 @@ svn/
 .local/share/shotwell
 .local/share/spacepiratesandzombies/
 .local/share/systemd/
+.local/share/Trash/
 .local/share/telepathy/
 .local/share/vlc/
 .local/share/webkit/
@@ -235,15 +251,9 @@ svn/
 .mozilla/firefox/Crash Reports/
 .mozilla/firefox/dvzrv
 .mozilla/firefox/dvzrv-backup/
-.mpd/folders/
-.mpd/mpd.db
-.mpd/mpd.log
-.mpd/mpd.pid
-.mpd/mpdstate
-.mpd/playlists/
-.mpd/sticker.sql
 .mpdscribble/
 .mplayer/
+.muttator/
 .mysql*
 .ncftp/
 .neocomplcache/
@@ -252,6 +262,8 @@ svn/
 .nicotine/
 .nvidia-settings-rc
 .octave_hist
+.p7zip
+.password-store/
 .pdextended
 .pdfedit/
 .pdirc
@@ -262,6 +274,7 @@ svn/
 .pryrc
 .pulse
 .pulse-cookie
+.purple/
 .python-eggs/
 .q3a/
 .qt/
@@ -293,6 +306,7 @@ svn/
 .texlive/
 .thumbnails/
 .thunderbird/
+.trousers/
 .ts3client/
 .tuxguitar-1.2/
 .unescaped_colors.rb
@@ -301,6 +315,7 @@ svn/
 .vimperator/
 .vimpressrc
 .vimrc
+.viminf*
 .vmoviedb/
 .wireshark/
 .wolf3d/
diff --git a/.zsh.after/functions.zsh b/.zsh.after/functions.zsh
index 2255af7..44ce51d 100644
--- a/.zsh.after/functions.zsh
+++ b/.zsh.after/functions.zsh
@@ -268,6 +268,9 @@ lopen() {
         ;;
         "photos")
           sudo cryptsetup luksOpen /dev/disk/by-id/ata-ST9500325AS_6VE457TN $1
+          if [ ! -h ~/.cache/shotwell ]; then
+            ln -s /mnt/photos/shotwell/ ~/.cache/shotwell
+          fi
         ;;
         "backup")
           sudo cryptsetup luksOpen /dev/disk/by-id/ata-HGST_HTS725050A7E630_TF755AWHHS9S1M $1