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.

19 files changed, 815 insertions, 341 deletions

diff --git a/.arduino/preferences.txt b/.arduino/preferences.txt
index 48522b4..6bfc106 100644
--- a/.arduino/preferences.txt
+++ b/.arduino/preferences.txt
@@ -1,4 +1,4 @@
-board=nano328
+board=uno
 browser=mozilla
 browser.linux=mozilla
 console=true
@@ -22,6 +22,7 @@ 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.linenumbers=false
 editor.tabs.expand=true
 editor.tabs.size=2
 editor.window.height.default=600
@@ -36,12 +37,12 @@ export.application.platform.macosx=true
 export.application.platform.windows=true
 export.application.stop=true
 export.delete_target_folder=true
-last.screen.height=1080
+last.ide.1.0.6.daterun=1411912958
+last.ide.1.0.6.hardwarepath=/usr/share/arduino/hardware
+last.screen.height=1200
 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
+last.sketch.count=0
+last.sketch0.path=
 launcher=xdg-open
 platform.auto_file_type_associations=true
 preproc.color_datatype=true
@@ -64,14 +65,14 @@ run.present.exclusive.macosx=true
 run.present.stop.color=#cccccc
 run.window.bgcolor=#DFDFDF
 serial.databits=8
-serial.debug_rate=57600
+serial.debug_rate=9600
 serial.parity=N
-serial.port=/dev/ttyUSB0
+serial.port=COM1
 serial.stopbits=1
-sketchbook.path=/home/dave/sketchbook
+sketchbook.path=/home/dave/.arduino/sketchbook
 target=arduino
 update.check=true
-update.id=7646775108848557509
-update.last=1404988647537
+update.id=-5111801774645063504
+update.last=1411912792122
 upload.using=bootloader
 upload.verify=true
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"
diff --git a/.gitignore b/.gitignore
index ca07228..e46956b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ svn/
 .Xauthority
 .android/
 .aprc
+.arduino/sketchbook
 .armagetronad/
 .audacity-data/
 .avidemux/
@@ -67,7 +68,7 @@ svn/
 .bzr.log
 .cache/
 .calfrc
-.cddb/
+.cddb*
 .cdemu-daemon.log
 .certs/
 .chromium-bsu
@@ -78,6 +79,7 @@ svn/
 .config/ImageMagick/
 .config/MusE/
 .config/MusicBrainz/
+.config/QtProject.conf
 .config/Skype/
 .config/SubDownloader/
 .config/SuperCollider/sessions/
@@ -135,8 +137,10 @@ svn/
 .config/profile-cleaner.conf
 .config/pulse/
 .config/pure-data/
+.config/q4wine
 .config/rncbc.org/
 .config/rubyripper/
+.config/smplayer
 .config/sound-juicer/
 .config/synergy-dvzrv.conf
 .config/systemd/
@@ -144,6 +148,7 @@ svn/
 .config/tint2/
 .config/user-dirs.locale
 .config/vlc/
+.config/xarchiver
 .config/xfce4
 .config/yelp/
 .converseen.conf
@@ -158,6 +163,7 @@ svn/
 .dropbox/
 .dvdcss/
 .dvdrip*
+.e
 .editrc
 .electrum/
 .escaped_colors.rb
@@ -195,6 +201,7 @@ svn/
 .h264enc/
 .htoprc
 .hugin
+.hydrogen
 .icedtea/
 .inkscape/
 .inputrc
@@ -209,10 +216,12 @@ svn/
 .kde4/
 .keychain/
 .khal/
+.kicad
 .lesshst
 .lfm_history
 .lives
 .lives-dir/
+.log
 .local/share/.converted-launchers
 .local/share/Psychonauts/
 .local/share/Steam/
@@ -221,6 +230,7 @@ svn/
 .local/share/birdie/
 .local/share/comix/
 .local/share/data/
+.local/share/desktop-directories
 .local/share/fontconfig/
 .local/share/gegl-0.1/
 .local/share/gegl-0.2/
@@ -240,7 +250,7 @@ svn/
 .local/share/telepathy/
 .local/share/vlc/
 .local/share/webkit/
-.log/
+.local/share/desktop-directoriey.log/
 .lyrics/
 .macromedia/
 .magick/
@@ -248,6 +258,7 @@ svn/
 .mateconfd/
 .matlab/
 .minecraft/
+.minetest
 .mozilla/firefox/Crash Reports/
 .mozilla/firefox/dvzrv
 .mozilla/firefox/dvzrv-backup/
@@ -262,6 +273,7 @@ svn/
 .nicotine/
 .nvidia-settings-rc
 .octave_hist
+.openra
 .p7zip
 .password-store/
 .pdextended
@@ -276,13 +288,15 @@ svn/
 .pulse-cookie
 .purple/
 .python-eggs/
-.q3a/
-.qt/
+.q3a
+.qucs
+.qt
 .rdebugrc
 .recently-used
 .revenge_of_the_titans/
 .revenge_of_the_titans_1.80/
 .rtorrent.rc
+.rubberband*
 .rvm/
 .sane/
 .scummvm/
@@ -299,6 +313,7 @@ svn/
 .steampath
 .steampid
 .subversion/
+.synfig
 .task/
 .taskrc
 .taxbird/
@@ -306,6 +321,7 @@ svn/
 .texlive/
 .thumbnails/
 .thunderbird/
+.tor-browser-en
 .trousers/
 .ts3client/
 .tuxguitar-1.2/
@@ -317,6 +333,7 @@ svn/
 .vimrc
 .viminf*
 .vmoviedb/
+.wine
 .wireshark/
 .wolf3d/
 .wxcam
diff --git a/.ncmpcpp/bindings b/.ncmpcpp/bindings
new file mode 100644
index 0000000..60c47da
--- /dev/null
+++ b/.ncmpcpp/bindings
@@ -0,0 +1,534 @@
+##########################################################
+## this is example bindings configuration file, copy it ##
+## to ~/.ncmpcpp/bindings and set up your preferences   ##
+##########################################################
+##
+##### General rules #####
+##
+## 1) Because each action has runtime checks whether it's
+##    ok to run it, a few actions can be bound to one key.
+##    Actions will be bound in order given in configuration
+##    file. When a key is pressed, first action in order
+##    will test itself whether it's possible to run it. If
+##    test succeeds, action is executed and other actions
+##    bound to this key are ignored. If it doesn't, next
+##    action in order tests itself etc.
+##
+## 2) It's possible to bind more that one action at once
+##    to a key. It can be done using the following syntax:
+##
+##    def_key "key"
+##      action1
+##      action2
+##      ...
+##
+##    This creates a chain of actions. When such chain is
+##    executed, each action in chain is run until the end of
+##    chain is reached or one of its actions fails to execute
+##    due to its requirements not being met. If multiple actions
+##    and/or chains are bound to the same key, they will be
+##    consecutively run until one of them gets fully executed.
+##
+## 3) When ncmpcpp starts, bindings configuration file is
+##    parsed and then ncmpcpp provides "missing pieces"
+##    of default keybindings. If you want to disable some
+##    bindings, there is a special action called 'dummy'
+##    for that purpose. Eg. if you want to disable ability
+##    to crop playlists, you need to put the following
+##    into configuration file:
+##
+##    def_key "C"
+##      dummy
+##
+##    After that ncmpcpp will not bind any default action
+##    to this key.
+##
+## 4) To let you write simple macros, the following special
+##    actions are provided:
+##
+##    - push_character "character" - pushes given special
+##      character into input queue, so it will be immediately
+##      picked by ncmpcpp upon next call to readKey function.
+##      Accepted values: mouse, up, down, page_up, page_down,
+##      home, end, space, enter, insert, delete, left, right,
+##      tab, shift_tab, ctrl_a, ctrl_b, ..., ctrl_z, f1, f2,
+##      ..., f12, backspace, backspace_2.
+##
+##    - push_characters "string" - pushes given string into
+##      input queue.
+##
+##    - require_runnable "action" - checks whether given action
+##      is runnable and fails if it isn't. This is especially
+##      useful when mixed with previous two functions. Consider
+##      the following macro definition:
+##
+##      def_key "key"
+##        push_characters "custom_filter"
+##        apply_filter
+##
+##      If apply_filter can't be currently run, we end up with
+##      sequence of characters in input queue which will be
+##      treated just as we typed them. This may lead to unexpected
+##      results (in this case 'c' will most likely clear current
+##      playlist, 'u' will trigger database update, 's' will stop
+##      playback etc.). To prevent such thing from happening, we
+##      need to change above definition to this one:
+##
+##      def_key "key"
+##        require_runnable "apply_filter"
+##        push_characters "custom_filter"
+##        apply_filter
+##
+##      Here, first we test whether apply_filter can be actually run
+##      before we stuff characters into input queue, so if condition
+##      is not met, whole chain is aborted and we're fine.
+##
+##    - require_screen "screen" - checks whether given screen is
+##      currently active. accepted values: browser, clock, help,
+##      media_library, outputs, playlist, playlist_editor,
+##      search_engine, tag_editor, visualizer, last_fm, lyrics,
+##      selected_items_adder, server_info, song_info,
+##      sort_playlist_dialog, tiny_tag_editor.
+##
+##    - run_external_command "command" - runs given command using
+##      system() function.
+##
+## 5) In addition to binding to a key, you can also bind actions
+##    or chains of actions to a command. If it comes to commands,
+##    syntax is very similar to defining keys. Here goes example
+##    definition of a command:
+##
+##      def_command "quit" [deferred]
+##        stop
+##        quit
+##
+##    If you execute the above command (which can be done by
+##    invoking action execute_command, typing 'quit' and pressing
+##    enter), ncmpcpp will stop the player and then quit. Note the
+##    presence of word 'deferred' enclosed in square brackets. It
+##    tells ncmpcpp to wait for confirmation (ie. pressing enter)
+##    after you typed quit. Instead of 'deferred', 'immediate'
+##    could be used. Then ncmpcpp will not wait for confirmation
+##    (enter) and will execute the command the moment it sees it.
+##
+## Note: Both 'backspace' and 'backspace_2' are used because some
+##       terminals interpret backspace using keycode of 'backspace'
+##       and some the one of 'backspace_2'. You can get away with
+##       binding once if all your terminal emulators use the same
+##       value.
+##
+## Note: There is a difference between:
+##
+##         def_key "key"
+##           action1
+##
+##         def_key "key"
+##           action2
+##
+##       and
+##
+##         def_key "key"
+##           action1
+##           action2
+##
+##      First one binds two single actions to the same key whilst
+##      second one defines a chain of actions. The behavior of
+##      these two is different and is described in (1) and (2).
+##
+## Note: Function def_key accepts non-ascii characters.
+##
+##### List of unbound actions #####
+##
+## The following actions are not bound to any key/command:
+##
+##  - set_volume
+##  - filter_playlist_on_priorities
+##
+#
+#def_key "mouse"
+#  mouse_event
+#
+#def_key "up"
+#  scroll_up
+#
+#def_key "down"
+#  scroll_down
+#
+#def_key "["
+#  scroll_up_album
+#
+#def_key "]"
+#  scroll_down_album
+#
+#def_key "{"
+#  scroll_up_artist
+#
+#def_key "}"
+#  scroll_down_artist
+#
+#def_key "page_up"
+#  page_up
+#
+#def_key "page_down"
+#  page_down
+#
+#def_key "home"
+#  move_home
+#
+#def_key "end"
+#  move_end
+#
+#def_key "space"
+#  press_space
+#
+#def_key "enter"
+#  press_enter
+#
+#def_key "delete"
+#  delete_playlist_items
+#
+#def_key "delete"
+#  delete_stored_playlist
+#
+#def_key "right"
+#  next_column
+#
+#def_key "right"
+#  slave_screen
+#
+#def_key "right"
+#  volume_up
+#
+#def_key "+"
+#  volume_up
+#
+#def_key "left"
+#  previous_column
+#
+#def_key "left"
+#  master_screen
+#
+#def_key "left"
+#  volume_down
+#
+#def_key "-"
+#  volume_down
+#
+#def_key ":"
+#  execute_command
+#
+#def_key "tab"
+#  next_screen
+#
+#def_key "shift_tab"
+#  previous_screen
+#
+#def_key "f1"
+#  show_help
+#
+#def_key "1"
+#  show_playlist
+#
+#def_key "2"
+#  show_browser
+#
+#def_key "2"
+#  change_browse_mode
+#
+#def_key "3"
+#  show_search_engine
+#
+#def_key "3"
+#  reset_search_engine
+#
+#def_key "4"
+#  show_media_library
+#
+#def_key "4"
+#  toggle_media_library_columns_mode
+#
+#def_key "5"
+#  show_playlist_editor
+#
+#def_key "6"
+#  show_tag_editor
+#
+#def_key "7"
+#  show_outputs
+#
+#def_key "8"
+#  show_visualizer
+#
+#def_key "="
+#  show_clock
+#
+#def_key "@"
+#  show_server_info
+#
+#def_key "s"
+#  stop
+#
+#def_key "p"
+#  pause
+#
+#def_key ">"
+#  next
+#
+#def_key "<"
+#  previous
+#
+#def_key "ctrl_h"
+#  jump_to_parent_directory
+#
+#def_key "ctrl_h"
+#  replay_song
+#
+#def_key "backspace"
+#  jump_to_parent_directory
+#
+#def_key "backspace"
+#  replay_song
+#
+#def_key "backspace_2"
+#  jump_to_parent_directory
+#
+#def_key "backspace_2"
+#  replay_song
+#
+#def_key "f"
+#  seek_forward
+#
+#def_key "b"
+#  seek_backward
+#
+#def_key "r"
+#  toggle_repeat
+#
+#def_key "z"
+#  toggle_random
+#
+#def_key "y"
+#  save_tag_changes
+#
+#def_key "y"
+#  start_searching
+#
+#def_key "y"
+#  toggle_single
+#
+#def_key "R"
+#  toggle_consume
+#
+#def_key "Y"
+#  toggle_replay_gain_mode
+#
+#def_key "t"
+#  toggle_space_mode
+#
+#def_key "T"
+#  toggle_add_mode
+#
+#def_key "|"
+#  toggle_mouse
+#
+#def_key "#"
+#  toggle_bitrate_visibility
+#
+#def_key "Z"
+#  shuffle
+#
+#def_key "x"
+#  toggle_crossfade
+#
+#def_key "X"
+#  set_crossfade
+#
+#def_key "u"
+#  update_database
+#
+#def_key "ctrl_v"
+#  sort_playlist
+#
+#def_key "ctrl_r"
+#  reverse_playlist
+#
+#def_key "ctrl_f"
+#  apply_filter
+#
+#def_key "/"
+#  find
+#
+#def_key "/"
+#  find_item_forward
+#
+#def_key "?"
+#  find
+#
+#def_key "?"
+#  find_item_backward
+#
+#def_key "."
+#  next_found_item
+#
+#def_key ","
+#  previous_found_item
+#
+#def_key "w"
+#  toggle_find_mode
+#
+#def_key "e"
+#  edit_song
+#
+#def_key "e"
+#  edit_library_tag
+#
+#def_key "e"
+#  edit_library_album
+#
+#def_key "e"
+#  edit_directory_name
+#
+#def_key "e"
+#  edit_playlist_name
+#
+#def_key "e"
+#  edit_lyrics
+#
+#def_key "i"
+#  show_song_info
+#
+#def_key "I"
+#  show_artist_info
+#
+#def_key "g"
+#  jump_to_position_in_song
+#
+#def_key "l"
+#  show_lyrics
+#
+#def_key "v"
+#  reverse_selection
+#
+#def_key "V"
+#  remove_selection
+#
+#def_key "B"
+#  select_album
+#
+#def_key "a"
+#  add_selected_items
+#
+#def_key "c"
+#  clear_playlist
+#
+#def_key "c"
+#  clear_main_playlist
+#
+#def_key "C"
+#  crop_playlist
+#
+#def_key "C"
+#  crop_main_playlist
+#
+#def_key "m"
+#  move_sort_order_up
+#
+#def_key "m"
+#  move_selected_items_up
+#
+#def_key "m"
+#  toggle_media_library_sort_mode
+#
+#def_key "m"
+#  set_visualizer_sample_multiplier
+#
+#def_key "n"
+#  move_sort_order_down
+#
+#def_key "n"
+#  move_selected_items_down
+#
+#def_key "M"
+#  move_selected_items_to
+#
+#def_key "A"
+#  add
+#
+#def_key "S"
+#  save_playlist
+#
+#def_key "o"
+#  jump_to_playing_song
+#
+#def_key "G"
+#  jump_to_browser
+#
+#def_key "G"
+#  jump_to_playlist_editor
+#
+#def_key "~"
+#  jump_to_media_library
+#
+#def_key "E"
+#  jump_to_tag_editor
+#
+#def_key "U"
+#  toggle_playing_song_centering
+#
+#def_key "P"
+#  toggle_display_mode
+#
+#def_key "\\"
+#  toggle_interface
+#
+#def_key "!"
+#  toggle_separators_between_albums
+#
+#def_key "L"
+#  toggle_lyrics_fetcher
+#
+#def_key "F"
+#  toggle_fetching_lyrics_in_background
+#
+#def_key "ctrl_l"
+#  toggle_screen_lock
+#
+#def_key "`"
+#  toggle_browser_sort_mode
+#
+#def_key "`"
+#  toggle_library_tag_type
+#
+#def_key "`"
+#  refetch_lyrics
+#
+#def_key "`"
+#  add_random_items
+#
+#def_key "ctrl_p"
+#  set_selected_items_priority
+#
+#def_key "q"
+#  quit
+#
+
+def_key "j"
+  scroll_down
+
+def_key "k"
+  scroll_up
+
+def_key "h"
+  previous_column
+
+def_key "l"
+  next_column
+
+def_key "L"
+  show_lyrics
+
+def_key "K"
+  toggle_lyrics_fetcher
+
+def_key "H"
+  show_help
diff --git a/.ncmpcpp/config b/.ncmpcpp/config
index 9be9957..80c0434 100644
--- a/.ncmpcpp/config
+++ b/.ncmpcpp/config
@@ -40,11 +40,13 @@ progressbar_look                = "   "
 header_visibility               = "no"
 statusbar_visibility            = "no"
 titles_visibility               = "no"
-screen_switcher_mode            = "sequence: 2 -> 3  -> 9 -> 10"
+#screen_switcher_mode            = "sequence: 2 -> 3  -> 9 -> 10"
 empty_tag_marker                = ""
 
 #LASTFM
 lastfm_preferred_language = "en"
+
+
 visualizer_in_stereo = "yes"
 visualizer_fifo_path = "/tmp/mpd.fifo"
 visualizer_output_name = "mpd_fifo"
diff --git a/.ncmpcpp/keys b/.ncmpcpp/keys
deleted file mode 100644
index 8e7585b..0000000
--- a/.ncmpcpp/keys
+++ /dev/null
@@ -1,190 +0,0 @@
-#####################################################
-## this is example key configuration file, copy it ##
-## to ~/.ncmpcpp/keys and set up your preferences  ##
-#####################################################
-##
-## Tips:
-## - it's possible to bind maximum two keys to a command
-## - keys can be defined with a character or a decimal value
-## - a command can be disabled by binding it to 0
-##
-## Note: First bind of volume_up/down
-## will be used to switch between columns.
-##
-#
-#key_up = 259 'k'
-#
-#key_down = 258 'j'
-#
-#key_up_album = '['
-#
-#key_down_album = ']'
-#
-#key_up_artist = '{'
-#
-#key_down_artist = '}'
-#
-#key_page_up = 339
-#
-#key_page_down = 338
-#
-#key_home = 262
-#
-#key_end = 360
-#
-#key_space = 32
-#
-#key_enter = 10
-#
-#key_delete = 330 'd'
-#
-#key_volume_up = 261 '+'
-#
-#key_volume_down = 260 '-'
-#
-#key_prev_column = 260
-key_prev_column = 'h' 260
-#
-#key_next_column = 261
-key_next_column = 'l' 261
-#
-#key_toggle_space_mode = 't'
-#
-#key_toggle_add_mode = 'T'
-#
-#key_toggle_mouse = '|'
-#
-#key_toggle_bitrate_visibility = '#'
-#
-#key_screen_switcher = 9
-#
-#key_backward_screen_switcher = 353
-#
-#key_help = '1' 265
-#
-#key_playlist = '2' 266
-#
-#key_browser = '3' 267
-#
-#key_search_engine = '4' 268
-#
-#key_media_library = '5' 269
-#
-#key_playlist_editor = '6' 270
-#
-#key_tag_editor = '7' 271
-#
-#key_outputs = '8' 272
-#
-#key_music_visualizer = '9' 273
-#
-#key_clock = '0' 274
-#
-#key_server_info = '@'
-#
-#key_stop = 's'
-#
-#key_pause = 'P'
-#
-#key_next = '>'
-#
-#key_prev = '<'
-#
-#key_replay = 263 127
-#
-#key_seek_forward = 'f'
-#
-#key_seek_backward = 'b'
-#
-#key_toggle_repeat = 'r'
-#
-#key_toggle_random = 'z'
-#
-#key_toggle_single = 'y'
-#
-#key_toggle_consume = 'R'
-#
-#key_toggle_replay_gain_mode = 'Y'
-#
-#key_shuffle = 'Z'
-#
-#key_toggle_crossfade = 'x'
-#
-#key_set_crossfade = 'X'
-#
-#key_update_db = 'u'
-#
-#key_sort_playlist = 22
-#
-#key_apply_filter = 6
-#
-#key_find_forward = '/'
-#
-#key_find_backward = '?'
-#
-#key_next_found_position = '.'
-#
-#key_prev_found_position = ','
-#
-#key_toggle_find_mode = 'w'
-#
-#key_edit_tags = 'e'
-#
-#key_go_to_position = 'g'
-#
-#key_song_info = 'i'
-#
-#key_artist_info = 'I'
-#
-#key_lyrics = 'l'
-key_lyrics = 'L'
-#
-#key_reverse_selection = 'v'
-#
-#key_deselect_all = 'V'
-#
-#key_select_album = 'B'
-#
-#key_add_selected_items = 'A'
-#
-#key_clear = 'c'
-#
-#key_crop = 'C'
-#
-#key_move_song_up = 'm'
-#
-#key_move_song_down = 'n'
-#
-#key_move_to = 'M'
-#
-#key_move_before = 0
-#
-#key_move_after = 0
-#
-#key_add = 'a'
-#
-#key_save_playlist = 'S'
-#
-#key_go_to_now_playing = 'o'
-#
-#key_toggle_auto_center = 'U'
-#
-#key_toggle_display_mode = 'p'
-#
-#key_toggle_separators_in_playlist = '!'
-#
-#key_toggle_lyrics_db = 'L'
-key_toggle_lyrics_db = 'K'
-#
-#key_toggle_fetching_lyrics_for_current_song_in_background = 'F'
-#
-#key_go_to_containing_directory = 'G'
-#
-#key_go_to_media_library = '~'
-#
-#key_go_to_parent_dir = 263 127
-#
-#key_switch_tag_type_list = '`'
-#
-#key_quit = 'q' 'Q'
-#
diff --git a/.vundles.local b/.vundles.local
index 2d1b274..2a63df5 100644
--- a/.vundles.local
+++ b/.vundles.local
@@ -14,3 +14,7 @@ Bundle "sjas/octave.vim"
 Bundle "vim-scripts/netrw.vim"
 " ctrlp
 Bundle "vim-scripts/ctrlp.vim"
+" vim-arduino-syntax
+Bundle "sudar/vim-arduino-syntax"
+" vim-arduino-snippets
+Bundle "sudar/vim-arduino-snippets"
diff --git a/.xinitrc b/.xinitrc
index 4eabc1e..8c51067 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Disable touchpad while typing using syndaemon
-if [[ -f /usr/bin/syndaemon ]]; then
-  syndaemon -t -k -i 2 &
-fi
+#if [[ -f /usr/bin/syndaemon ]]; then
+#  syndaemon -t -k -i 2 &
+#fi
 
 #X11 keyboard maps
 setxkbmap -layout de
diff --git a/.zsh.after/aliases.zsh b/.zsh.after/aliases.zsh
index 7659e00..8201ef6 100644
--- a/.zsh.after/aliases.zsh
+++ b/.zsh.after/aliases.zsh
@@ -1,6 +1,4 @@
 # < ZSH ALIASES
-## SOURCE ALIASES
-#[ -e $HOME/.zsh.after/aliases.sh ] && source $HOME/.zsh.after/aliases.sh
 ## EXTENSIONS
 alias -s pdf='mupdf'
 alias -s ps='mupdf'
@@ -15,8 +13,7 @@ alias -s tlz='tar --lzma -xvf'
 alias -s rar='unrar x'
 alias -s tex='mkpdf'
 
-
-#ls aliases
+##LS
 alias ls='ls --group-directories-first --color=auto'
 alias ll="ls -lh"
 alias la="ls -a"
@@ -32,152 +29,176 @@ alias lla='ls -lA'
 alias lsfw='ls -lah /dev|grep fw'
 alias lsvid='ls -lah /dev|grep video'
 
+##DU
+alias du1='du -hd1'
+
+##TREE
+alias tree='tree -aC'
 #grep aliases (with excluded directories)
 alias grepdot='grep -rI --exclude-dir=".steam" --exclude-dir=".local" --exclude-dir=".thunderbird" --exclude-dir=".mozilla" --exclude-dir="git" --exclude-dir=".rvm" --exclude-dir=".log" --exclude-dir=".dropbox-dist" --exclude-dir=".config" '
 
-## systemd related aliases
+
+##SYSTEMD
+#tree
 alias psc='ps xawf -eo pid,user,cgroup,args'
 alias treeg='tree -d /cgroup/systemd/'
-alias sdstree='tree -aC /usr/lib/systemd/system'
-alias sdutree='tree -aC /etc/systemd/system'
+alias sdptree='tree -aC /usr/lib/systemd/'
+alias sdstree='tree -aC /etc/systemd/'
+alias sdutree='tree -aC $HOME/.config/systemd/'
+#systemctl
 alias sdl='sudo systemctl --all'
 alias sdlerr='sudo systemctl --all --full |grep error'
 alias sdlfail='sudo systemctl --all --full |grep failed'
-alias sddreload='sudo systemctl daemon-reload'
+#timers
+alias sdt='sudo systemctl list-timers'
+#journalctl
 alias sdj='sudo journalctl'
-alias sdjgrep='sudo journalctl -an1000 |grep '
-alias sdstart='sudo systemctl start'
-alias sdstop='sudo systemctl stop'
-alias sdreload='sudo systemctl reload'
-alias sdenable='sudo systemctl enable'
-alias sddisable='sudo systemctl disable'
-alias sdreenable='sudo systemctl reenable'
-alias sdisactive='sudo systemctl is-active'
-alias sdisenabled='sudo systemctl is-enabled'
-alias sdstat='sudo systemctl status --all --full'
-alias sdcwants='sudo systemctl show -p "Wants"'
-alias sdcwantedby='sudo systemctl show -p "WantedBy"'
-alias sdcrequires='sudo systemctl show -p "Requires"'
-alias sdcrequiredby='sudo systemctl show -p "RequiredBy"'
-alias sdcconflicts='sudo systemctl show -p "Conflicts"'
-alias sdcconflictedby='sudo systemctl show -p "ConflictedBy"'
-alias sdcbefore='sudo systemctl show -p "Before"'
-alias sdcafter='sudo systemctl show -p "After"'
+alias sdjf='sudo journalctl -f'  #Follow the messages
+alias sdjb='sudo journalctl -b'  #Show only messages from this boot
+alias sdju='sudo journalctl -u'  #Show messages of only the specified unit
+alias sdjk='journalctl _TRANSPORT=kernel' #Show kernel ring buffer
+alias sdjp='sudo journalctl _PID='  #Show all messages of specified process (PID)
+alias sdjgrep='sudo journalctl -an1000 |grep ' #Use a grep command to search through journal
+#systemd system services
+alias sdsstart='sudo systemctl start'
+alias sdsstop='sudo systemctl stop'
+alias sdsrestart='sudo systemctl restart'
+alias sdsreload='sudo systemctl reload'
+alias sdsenable='sudo systemctl enable'
+alias sdsdisable='sudo systemctl disable'
+alias sdsreenable='sudo systemctl reenable'
+alias sdsisactive='sudo systemctl is-active'
+alias sdsisenabled='sudo systemctl is-enabled'
+alias sdsstat='sudo systemctl status --all --full'
+alias sdswants='sudo systemctl show -p "Wants"'
+alias sdswantedby='sudo systemctl show -p "WantedBy"'
+alias sdsrequires='sudo systemctl show -p "Requires"'
+alias sdsrequiredby='sudo systemctl show -p "RequiredBy"'
+alias sdsconflicts='sudo systemctl show -p "Conflicts"'
+alias sdsconflictedby='sudo systemctl show -p "ConflictedBy"'
+alias sdsbefore='sudo systemctl show -p "Before"'
+alias sdsafter='sudo systemctl show -p "After"'
+alias sdst='sudo systemctl list-timers'
+alias sdsreload='sudo systemctl daemon-reload'
+#systemd user services
+alias sdustart='systemctl --user start'
+alias sdustop='systemctl --user stop'
+alias sdurestart='systemctl --user restart'
+alias sdureload='systemctl --user reload'
+alias sduenable='systemctl --user enable'
+alias sdudisable='systemctl --user disable'
+alias sdureenable='systemctl --user reenable'
+alias sduisactive='systemctl --user is-active'
+alias sduisenabled='systemctl --user is-enabled'
+alias sdustat='systemctl --user status --all --full'
+alias sduwants='systemctl --user show -p "Wants"'
+alias sduwantedby='systemctl --user show -p "WantedBy"'
+alias sdurequires='systemctl --user show -p "Requires"'
+alias sdurequiredby='systemctl --user show -p "RequiredBy"'
+alias sduconflicts='systemctl --user show -p "Conflicts"'
+alias sduconflictedby='systemctl --user show -p "ConflictedBy"'
+alias sdubefore='systemctl --user show -p "Before"'
+alias sduafter='systemctl --user show -p "After"'
+alias sdut='systemctl --user list-timers'
+alias sdureload='systemctl --user daemon-reload'
+#poweroff/reboot/isolate
 alias sdiso='sudo systemctl isolate '
-alias sdrestart='sudo systemctl restart'
 alias sdreboot='sudo systemctl reboot'
 alias sdpoweroff='sudo systemctl poweroff'
+#systemd bootchart
 alias sda='systemd-analyze'
 alias sdab='systemd-analyze blame'
-alias sdap='rm -f $HOME/Dropbox/sync/archlinux/sdap-$HOST.svg; systemd-analyze plot > $HOME/Dropbox/sync/archlinux/sdap-$HOST.svg'
+if [ -x /usr/bin/xsvg ]; then
+  alias sdap='xsvg $HOME/ownCloud/photos/systemd/sdap-$HOST.svg'
+fi
 
-## Pacman related aliases
+##PACMAN
 alias paclid="sudo pacman -Qi | sed '/^Depends On/,/^Required By/{ s/^Required By.*$//; H; d }; /^Name/!d; /^Name/{ n;x;}'| sed '/^$/s//==================================================================================/'"
-alias pacsize="pacman -Qi | awk '/^Name/ {pkg=\$3} /Size/ {print \$4\$5,pkg}' | sort -n"	#All packages by size
-alias pacall="sudo pacman -Qi | awk '/^Name/ {pkg=\$3} /Version/ {ver=\$3} /Size/ {size=\$4\$5} {print pkg,ver,size}' | uniq"	#All packages uniquely with name, version, size
-#alias pacremorph='sudo pacman -Rs $(pacman -Qtdq)'	#Remove all orphaned packages
-alias pacup='sudo pacman -Syu'	# Synchronize with repositories before upgrading packages that are out of date on the local system.
-alias pac='sudo pacman -S'	# Install specific package(s) from the repositories
-alias pacu='sudo pacman -U'	# Install specific package not from the repositories but from a file 
-alias pacre='sudo pacman -R'	# Remove the specified package(s), retaining its configuration(s) and required dependencies
-alias pacrem='sudo pacman -Rns'	# Remove specified package(s), its configuration(s) and unneeded depends
-alias pacsearch="pacman -Sl | cut -d' ' -f2 | grep "	# Search through all available packages in repo
-alias pacname="sudo pacman -Qi|grep Name|grep " #Search through names of packages by string
-alias pacri='pacman -Si'	# Display information about a given package in the repositories
-alias pacrs='pacman -Ss'	# Search for package(s) in the repositories
-alias pacli='pacman -Qi'	# Display information about a given package in the local database
-alias pacls='pacman -Qs'	# Search for package(s) in the local database
-alias pacorph='sudo pacman -Qdt'	# Search for orphan packages
-alias paclal='sudo pacman -Ql'	# List installed files of a given package
-alias pacg='pacman -Sg'	#List all groups or all packages in specified group
-alias pacclean='sudo pacman -Sc'	# Remove all packages from local repository, not installed atm, remove all unused repos
-alias pacconf='sudo find /etc -name "*.pac*" -type f -print'	# Search for .pacnew and .pacsave files
-alias pacfile='sudo pacman -Qo'	# Find out what package a give file belongs to
-alias pacupd='sudo pacman -Sy && sudo abs'     # Update and refresh the local package and ABS databases against repositories
-alias pacdep='sudo pacman -S --asdeps'        # Install given package(s) as dependencies of another package
-alias pacmir='sudo pacman -Syy'                # Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
-alias packup='comm -23 <(pacman -Qeq|sort) <(pacman -Qmq|sort) > $HOME/Dropbox/sync/archlinux/pkglist-$HOST' # Backup the current list of non-local packages
-alias pacret='sudo pacman -S $(< $HOME/Dropbox/sync/archlinux/pkglist-$HOST)' # Install from the backup list
-alias pacredown='sudo pacman -S $(comm -23 <(pacman -Qeq) <(pacman -Qmq))' # Redownload all installed packages (minus AUR)
-alias pacdis='rm -f $HOME/Dropbox/sync/archlinux/non-pkg-$HOST; sudo pacman-disowned > $HOME/Dropbox/sync/archlinux/non-pkg-$HOST' # Getting a list of files not owned by any package
-alias packimp='sudo pacman-key -r '	#Import a key ID to the pacman keyring
-alias packsign='sudo pacman-key --lsign-key '	#Sign a key ID after importing it to the keyring
-alias packref='sudo pacman-key --refresh-keys'	#Refresh the list of master keys
-
-##Yaourt aliases
-alias yaup='yaourt -Syu --devel --aur'          # Updates all locally installed repository, AUR and git packages
-alias yadb='yaourt -B $HOME/Dropbox/sync/archlinux'            # Backs up the yaourt database
-
-
-
-#[ -e ~/Dropbox/sync/archlinux ] && source ~/Dropbox/sync/archlinux/handies.bashrc && source ~/Dropbox/sync/archlinux/color.bashrc && source ~/Dropbox/sync/archlinux/pacman.bashrc && source ~/Dropbox/sync/archlinux/systemd.bashrc
-
+alias pacsize="pacman -Qi | awk '/^Name/ {pkg=\$3} /Size/ {print \$4\$5,pkg}' | sort -n"  #Show all packages by size
+alias pacall="sudo pacman -Qi | awk '/^Name/ {pkg=\$3} /Version/ {ver=\$3} /Size/ {size=\$4\$5} {print pkg,ver,size}' | uniq"  #All packages uniquely with name, version, size
+alias pacup='sudo pacman -Syu'  #Synchronize with repositories before upgrading packages that are out of date on the local system.
+alias pac='sudo pacman -S'  #Install specific package(s) from the repositories
+alias pacu='sudo pacman -U'  #Install specific package not from the repositories but from a file 
+alias pacre='sudo pacman -R'  #Remove the specified package(s), retaining its configuration(s) and required dependencies
+alias pacrem='sudo pacman -Rns'  #Remove specified package(s), its configuration(s) and unneeded depends
+alias pacsearch="pacman -Sl | cut -d' ' -f2 | grep "  #Search through all available packages in repo
+alias pacname="sudo pacman -Qi|grep Name|grep "  #Search through names of packages by string
+alias pacri='pacman -Si'  #Display information about a given package in the repositories
+alias pacrs='pacman -Ss'  #Search for package(s) in the repositories
+alias pacli='pacman -Qi'  #Display information about a given package in the local database
+alias pacls='pacman -Qs'  #Search for package(s) in the local database
+alias pacorph='sudo pacman -Qdt'  #Search for orphan packages
+alias paclal='sudo pacman -Ql'  #List installed files of a given package
+alias pacg='pacman -Sg'  #List all groups or all packages in specified group
+alias pacclean='sudo pacman -Sc'  #Remove all packages from local repository, not installed atm, remove all unused repos
+alias pacconf='sudo find /etc -name "*.pac*" -type f -print'  #Search for .pacnew and .pacsave files
+alias pacfile='sudo pacman -Qo'  # Find out what package a give file belongs to
+alias pacupd='sudo pacman -Sy && sudo abs'  #Update and refresh the local package and ABS databases against repositories
+alias pacdep='sudo pacman -S --asdeps'  #Install given package(s) as dependencies of another package
+alias pacmir='sudo pacman -Syy'  #Force refresh of all package lists after updating /etc/pacman.d/mirrorlist
+alias packup='comm -23 <(pacman -Qeq|sort) <(pacman -Qmq|sort) > $HOME/Dropbox/sync/archlinux/pkglist-$HOST'  #Backup the current list of non-local packages
+alias pacret='sudo pacman -S $(< $HOME/Dropbox/sync/archlinux/pkglist-$HOST)'  #Install from the backup list
+alias pacredown='sudo pacman -S $(comm -23 <(pacman -Qeq) <(pacman -Qmq))'  #Redownload all installed packages (minus AUR)
+alias pacdis='sudo pacman-disowned > /tmp/$USERNAME/non-pkg-$HOST'  #Getting a list of files not owned by any package
+alias packimp='sudo pacman-key -r '  #Import a key ID to the pacman keyring
+alias packsign='sudo pacman-key --lsign-key '  #Sign a key ID after importing it to the keyring
+alias packref='sudo pacman-key --refresh-keys'  #Refresh the list of master keys
+
+##YAOURT
+alias yaup='yaourt -Syu --devel --aur'  #Updates all locally installed repository, AUR and git packages
+alias yadb='yaourt -B $HOME/ownCloud/backup/settings/'  #Backs up the yaourt database
+
+##XCLIP
 alias cpx="xclip -selection clipboard"
+alias cpx="xclip"
 
-#load bluetooth headphone module for pulseaudio
-alias bthp="pactl load-module module-bluetooth-device address='00:1B:66:01:6C:D1'"
-#dir aliases
-alias cd.sdu="cd /etc/systemd/system"
-alias cd.sds="cd /usr/lib/systemd/system"
-alias cd.courses="cd /home/dave/Dropbox/tu-berlin/courses"
-alias cd.cks="cd /home/dave/Dropbox/tu-berlin/courses/SE\ Klanganalyse\ und\ Synthese/project"
-alias cd.cksp="cd /home/dave/Dropbox/tu-berlin/courses/SE\ Klanganalyse\ und\ Synthese/paper"
-alias cd.atlab="cd /home/dave/Dropbox/tu-berlin/courses/PR\ Audiotechnik"
-alias cd.atue="cd /home/dave/Dropbox/tu-berlin/courses/UE\ Audiotechnik\ 2"
-alias cd.semin="cd /home/dave/Dropbox/tu-berlin/courses/SE\ Minimal\ music\ and\ art"
-alias cd.sere="cd /home/dave/Dropbox/tu-berlin/courses/SE\ Digital\ reenactments\ of\ scores\ originally\ requiring\ analog\ electronics"
-alias cd.seti="cd /home/dave/Dropbox/tu-berlin/courses/SE\ Time\ and\ space\ perceptions\ in\ sound\ installations"
-alias cd.archlinux="cd /home/dave/Dropbox/software/archlinux"
-alias cd.syncarchlinux="cd /home/dave/Dropbox/sync/archlinux"
-alias cd.scpref="cd /home/dave/.config/SuperCollider"
-
-#program aliases
+##CD
+alias cd.sds="cd /etc/systemd/system"
+alias cd.sdp="cd /usr/lib/systemd/system"
+alias cd.courses="cd $HOME/ownCloud/documents/university/tu-berlin/courses"
+alias cd.backup="cd $HOME/ownCloud/backup"
+alias cd.scpref="cd $HOME/.config/SuperCollider"
+
+##OCTAVE
 #alias octave="octave --silent --braindead --force-gui"
 alias octave="octave --force-gui"
+
+##MATLAB
 alias matlabc="matlab -nodesktop -nosplash"
-alias "dbrestart"="dropbox stop && dropbox start"
-alias psgrep='ps xa | grep $1'
 
-#nmcli aliases
+##NMCLI
 alias nmup="sudo nmcli con up id"
 alias nmdown="sudo nmcli con down id"
-alias nmstat="sudo nmcli con status"
+alias nmstat="sudo nmcli con show --active"
 alias nmlist="sudo nmcli con list"
 alias nmdev="sudo nmcli dev"
 
-#ssh aliases
+#SSH
 alias pool='ssh pool -Y'
 alias sshtunnel="ssh -ND 44350 -v -p 46399 dave@frqb.zapto.org" # tunnel through home
 alias frqtun="ssh -ND 44350 -v frq"
 alias scp=scp
 
-#keychain aliases
+#KEYCHAIN
 alias keyflush="keychain --clear && keychain -k mine"
 
-#pulseaudio aliases
+#PULSEAUDIO
 alias pak='pulseaudio --kill'
 alias pas='pulseaudio --start'
 alias paflush='pax11publish -r'
+alias bthp="pactl load-module module-bluetooth-device address='00:1B:66:01:6C:D1'"  #load bluetooth headphone module for pulseaudio
 
-#wake on lan aliases
-alias woldave_in='wol -i dave 00:15:f2:e0:e0:c6'
-alias woldave_ex='wol -p X -i frqb.zapto.org 00:15:f2:e0:e0:c6'
-
-#truecrypt mount aliases
-alias tc.fav='truecrypt -t --protect-hidden=no -k="" --auto-mount=favorites'
-alias tc.v='truecrypt -t --mount --fs-options=users,uid=$(id -u),gid=$(id -g),fmask=0113,dmask=0002 --protect-hidden=no -k="" /dev/disk/by-id/ata-ST9500325AS_6VE457TN /mnt/photos'
-alias tc.m='truecrypt -t --mount --fs-options=users,uid=$(id -u),gid=$(id -g),fmask=0113,dmask=0002 --protect-hidden=no -k="" /dev/disk/by-id/ata-ST9500325AS_6VE152RS /mnt/music'
-alias tc.d='truecrypt -t -d'
-
+#WOL
+alias woldave_in='wol -i homey 00:15:f2:e0:e0:c6'  #wake up homey
+alias woldave_ex='wol -p X -i frqb.zapto.org 00:15:f2:e0:e0:c6'  #wake up homey via 
 
 ## OVERRIDES
 # Colorize grep output
 alias grep='grep --color=auto --exclude-dir=.git'
+alias psgrep='ps aux | grep -v "grep"| grep $1'
 alias exit="clear; exit"
 alias du='du -h'
 alias .='source'
-unalias brew
-#  unalias scp
 
 ## HELP
 alias helpdd='echo dd if=bla | pv -s 10M | dd of=blob'
diff --git a/bin/backup-profiles b/bin/backup-profiles
index fd7eb3b..9e5c9a1 100755
--- a/bin/backup-profiles
+++ b/bin/backup-profiles
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Backup profiles of firefox and thunderbird to local Dropbox (or other location) while encrypting them using gpg
+# Backup profiles of firefox and thunderbird to local ownCloud (or other location) while encrypting them using gpg
 #
 
 firefoxPID=`ps -C firefox -o pid=`
@@ -23,7 +23,7 @@ then
   tar cfPzh $firefoxTMP -C $firefoxIF $profileName
   echo "Encrypting profile."
   gpg -e -r 'David Runge <david.runge@frqrec.com>' $firefoxTMP
-  echo "Moving backup to Dropbox."
+  echo "Moving backup to ownCloud."
   mv -f $firefoxTMP$gpgEND $OF
   echo "Cleaning up."
   rm $firefoxTMP
@@ -36,7 +36,7 @@ else
     tar cfPzh $firefoxTMP -C $firefoxIF $profileName$backupEND
     echo "Encrypting profile."
     gpg -e -r 'David Runge <david.runge@frqrec.com>' $firefoxTMP
-    echo "Moving backup to Dropbox."
+    echo "Moving backup to ownCloud."
     mv -f $firefoxTMP$gpgEND $OF
     echo "Cleaning up."
     rm $firefoxTMP
@@ -53,7 +53,7 @@ then
   tar cfPz $thunderbirdTMP -C $thunderbirdIF $profileName
   echo "Encrypting profile."
   gpg -e -r 'David Runge <david.runge@frqrec.com>' $thunderbirdTMP
-  echo "Moving backup to Dropbox."
+  echo "Moving backup to ownCloud."
   mv -f $thunderbirdTMP$gpgEND $OF
   echo "Cleaning up."
   rm $thunderbirdTMP
diff --git a/bin/check-rt b/bin/check-rt
new file mode 100755
index 0000000..5dc04cd
--- /dev/null
+++ b/bin/check-rt
@@ -0,0 +1,11 @@
+#!/bin/env bash
+#Check if the kernel name has -rt in it (we're running Realtime Kernel)
+
+if [[ $(uname -r) == *-rt* ]];then
+ echo "Success: Running $(uname -r)."
+ exit 0
+else
+ echo "Failure: Running $(uname -r)."
+ exit 1
+fi
+
diff --git a/bin/check-vanilla b/bin/check-vanilla
new file mode 100755
index 0000000..6b4bdd4
--- /dev/null
+++ b/bin/check-vanilla
@@ -0,0 +1,11 @@
+#!/bin/env bash
+#Check if the kernel name has -rt in it (we're running Realtime Kernel)
+
+if [[ $(uname -r) == *-rt* ]];then
+ echo "Failure: Running $(uname -r)."
+ exit 1
+else
+ echo "Success: Running $(uname -r)."
+ exit 0
+fi
+
diff --git a/bin/start_jack b/bin/start_jack
index 48e97ed..735d5fa 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+export DISPLAY=:0.0
 #jackd -P70 -p16 -t2000 -dalsa -dhw:0,0 -p128 -n3 -r44100 -s > .log/jackd.log 2>&1 &
 
+echo $HOSTNAME
 case "$HOSTNAME" in
   "pitheunlord")
     jackd -P95 -p32 -ddummy -C1 &> .log/jackd.log &
@@ -22,11 +24,39 @@ case "$HOSTNAME" in
   "dvzrv")
     DEVICE="/dev/fw1"
     if [[ -e $DEVICE && -r $DEVICE && -w $DEVICE ]]; then
-      echo "Setting up Motu Traveler with JACK"
+      echo "Setting up "$DEVICE" with JACK."
+      jack_control start
+      sudo schedtool -R -p 20 `pidof jackdbus`
+      jack_control eps realtime true
+      jack_control ds firewire
+      jack_control dps device $DEVICE
+      jack_control dps rate 48000
+      #jack_control dps rate 44100
+      jack_control dps nperiods 2
+      #jack_control dps period 64
+      jack_control dps period 256
+      sleep 3
+      a2jmidid -e &
+      sudo schedtool -R -p 20 `pidof a2jmidid`
+      rm ~/.config/SuperCollider/startup.scd
+      ln -s ~/.config/SuperCollider/startupfiles/electronicStudio.scd ~/.config/SuperCollider/startup.scd -v
     else
-      echo "Setting up internal JACK server"
+      echo "Setting up ALSA with JACK."
+      jack_control start
+      sudo schedtool -R -p 20 `pidof jackdbus`
+      jack_control eps realtime true
+      jack_control ds alsa
+      jack_control dps device hw:PCH
+      jack_control dps rate 48000
+      jack_control dps nperiods 2
+      jack_control dps period 256
+      sleep 4
+      a2jmidid -e &
+      sudo schedtool -R -p 20 `pidof a2jmidid`
+      rm ~/.config/SuperCollider/startup.scd
+      ln -s ~/.config/SuperCollider/startupfiles/startupSystem.scd ~/.config/SuperCollider/startup.scd -v
+
     fi
-#    jack_control start
     ;;
 esac
 
diff --git a/bin/stop_jack b/bin/stop_jack
index ab49fa9..9c47548 100755
--- a/bin/stop_jack
+++ b/bin/stop_jack
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-kill $(pidof jackd)
+jack_control stop
+sleep 3
+jack_control exit
+exit 0
+
+#kill $(pidof jackd)
 #case "$HOSTNAME" in
 #  "beagleclone")
 #    kill $(pidof jackd)
diff --git a/bin/tmux-mem-cpu-load b/bin/tmux-mem-cpu-load
new file mode 100755
index 0000000..aeb7c7c
--- /dev/null
+++ b/bin/tmux-mem-cpu-load