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

* 'master' of https://github.com/davezerave/dot:
  Adding systemd suspend alias
  Adding iptables syntax for vim
  Adding further ignores for arduino and processing settings folder
  Moving arduino and processing sketchbook directory to git subdirectory.

5 files changed, 98 insertions, 4 deletions

diff --git a/.arduino/preferences.txt b/.arduino/preferences.txt
index 6bfc106..1401472 100644
--- a/.arduino/preferences.txt
+++ b/.arduino/preferences.txt
@@ -69,7 +69,7 @@ serial.debug_rate=9600
 serial.parity=N
 serial.port=COM1
 serial.stopbits=1
-sketchbook.path=/home/dave/.arduino/sketchbook
+sketchbook.path=/home/dave/git/sketchbooks/arduino-sketchbook
 target=arduino
 update.check=true
 update.id=-5111801774645063504
diff --git a/.gitignore b/.gitignore
index e46956b..8f8ecfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,8 @@ svn/
 .Xauthority
 .android/
 .aprc
-.arduino/sketchbook
+.arduino/console
+.arduino/recent.txt
 .armagetronad/
 .audacity-data/
 .avidemux/
@@ -281,8 +282,9 @@ svn/
 .pdirc
 .pip/
 .pki/
-.processing/
 .profile
+.processing/console
+.processing/recent.txt
 .pryrc
 .pulse
 .pulse-cookie
diff --git a/.processing/preferences.txt b/.processing/preferences.txt
new file mode 100644
index 0000000..9b1429c
--- /dev/null
+++ b/.processing/preferences.txt
@@ -0,0 +1,88 @@
+buttons.hide.image=false
+chooser.files.native=false
+chooser.files.native.linux=false
+console.auto_clear=true
+console.font.size=12
+console.length=500
+console.lines=4
+contribution.backup.on_install=true
+contribution.backup.on_remove=true
+editor.caret.blink=true
+editor.caret.block=false
+editor.divider.size=0
+editor.divider.size.windows=2
+editor.font.family=Source Code Pro
+editor.font.size=12
+editor.indent=true
+editor.input_method_support=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.home_and_end_travel_smart=true
+editor.keys.shift_backspace_is_delete=false
+editor.laf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
+editor.laf.linux=com.sun.java.swing.plaf.gtk.GTKLookAndFeel
+editor.smooth=true
+editor.tabs.expand=true
+editor.tabs.size=2
+editor.token.comment1.style=#666666,plain
+editor.token.comment2.style=#666666,plain
+editor.token.function1.style=#006699,plain
+editor.token.function2.style=#006699,plain
+editor.token.function3.style=#669900,plain
+editor.token.function4.style=#006699,bold
+editor.token.invalid.style=#666666,bold
+editor.token.keyword1.style=#33997e,plain
+editor.token.keyword2.style=#33997e,plain
+editor.token.keyword3.style=#669900,plain
+editor.token.keyword4.style=#d94a7a,plain
+editor.token.keyword5.style=#e2661a,plain
+editor.token.label.style=#666666,bold
+editor.token.literal1.style=#7D4793,plain
+editor.token.literal2.style=#718a62,plain
+editor.token.operator.style=#006699,plain
+editor.untitled.prefix=sketch_
+editor.untitled.suffix=yyMMdd
+editor.window.height.default=600
+editor.window.height.min=500
+editor.window.height.min.macosx=450
+editor.window.height.min.windows=530
+editor.window.width.default=500
+editor.window.width.min=400
+export.application.embed_java=true
+export.application.fullscreen=false
+export.application.stop=true
+export.delete_target_folder=true
+header.hide.image=false
+instance_server.key=0.005307518970972369
+instance_server.port=60338
+last.sketch.count=0
+last.sketch.mode=processing.mode.java.JavaMode
+last.sketch.restore=true
+launcher=xdg-open
+platform.auto_file_type_associations=true
+preproc.color_datatype=true
+preproc.enhanced_casting=true
+preproc.output_parse_tree=false
+preproc.save_build_files=false
+preproc.substitute_floats=true
+preproc.substitute_unicode=true
+preproc.web_colors=true
+proxy.host=
+proxy.port=
+recent.count=10
+run.display=0
+run.options=
+run.options.bits.macosx=32
+run.options.memory=false
+run.options.memory.initial=64
+run.options.memory.maximum=256
+run.present.bgcolor=#666666
+run.present.stop.color=#cccccc
+run.window.bgcolor=#DFDFDF
+sketchbook.path=/home/dave/git/sketchbooks/processing-sketchbook
+toolbar.hide.image=false
+update.check=false
+update.id=-2232603851351662427
+update.last=1395616194592
diff --git a/.vundles.local b/.vundles.local
index 2a63df5..4763c30 100644
--- a/.vundles.local
+++ b/.vundles.local
@@ -18,3 +18,5 @@ Bundle "vim-scripts/ctrlp.vim"
 Bundle "sudar/vim-arduino-syntax"
 " vim-arduino-snippets
 Bundle "sudar/vim-arduino-snippets"
+" vim-iptables
+Bundle "vim-scripts/iptables"
diff --git a/.zsh.after/aliases.zsh b/.zsh.after/aliases.zsh
index 8201ef6..54881f8 100644
--- a/.zsh.after/aliases.zsh
+++ b/.zsh.after/aliases.zsh
@@ -105,6 +105,7 @@ alias sdureload='systemctl --user daemon-reload'
 alias sdiso='sudo systemctl isolate '
 alias sdreboot='sudo systemctl reboot'
 alias sdpoweroff='sudo systemctl poweroff'
+alias sdsuspend='sudo systemctl suspend'
 #systemd bootchart
 alias sda='systemd-analyze'
 alias sdab='systemd-analyze blame'
@@ -190,12 +191,13 @@ alias bthp="pactl load-module module-bluetooth-device address='00:1B:66:01:6C:D1
 
 #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 
+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 greptodo='grep -R "TODO" .'
 alias exit="clear; exit"
 alias du='du -h'
 alias .='source'