# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1507491098 14400
# Node ID 22b5581eba39cb35ba3654e3a9cc483610775c68
# Parent  15bd14518a985c3e39d2309468be69ab65ec5550# Parent  816a02d790f80684158cb0f8706bdb3f36150e40
Merge.

diff -r 816a02d790f8 -r 22b5581eba39 .hgsubstate
--- a/.hgsubstate	Fri Oct 06 11:52:28 2017 -0400
+++ b/.hgsubstate	Sun Oct 08 15:31:38 2017 -0400
@@ -39,5 +39,5 @@
 f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
 bf3fd7f67e730f93765bd3c1cfcdb18fd4043521 vim/bundle/vitality
-2686da25b205ae20380a80271efdd74cfbc3969e vim/bundle/vlime
+faff23c03a5a1f28d6ef5963e6a9caa46af7074a vim/bundle/vlime
 6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap
diff -r 816a02d790f8 -r 22b5581eba39 agignore
--- a/agignore	Fri Oct 06 11:52:28 2017 -0400
+++ b/agignore	Sun Oct 08 15:31:38 2017 -0400
@@ -5,3 +5,4 @@
 *.public.key
 *.private.key
 *.pgp
+*.fasl
diff -r 816a02d790f8 -r 22b5581eba39 bin/arduino-serial
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/arduino-serial	Sun Oct 08 15:31:38 2017 -0400
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+rlwrap -I -m @ -M .lisp -a ___ -O '^[a-zA-Z0-9]+>' -p BLUE -q '"' python -m serial.tools.miniterm /dev/cu.usbmodem* 9600 --exit-char 38 --eol LF
diff -r 816a02d790f8 -r 22b5581eba39 ffignore
--- a/ffignore	Fri Oct 06 11:52:28 2017 -0400
+++ b/ffignore	Sun Oct 08 15:31:38 2017 -0400
@@ -6,6 +6,7 @@
 .m2
 
 syntax:regex
-^tags$
-^tags.bak$
+\btags$
+\btags.bak$
 \.meta$
+\.fasl$
diff -r 816a02d790f8 -r 22b5581eba39 fish/config.fish
--- a/fish/config.fish	Fri Oct 06 11:52:28 2017 -0400
+++ b/fish/config.fish	Sun Oct 08 15:31:38 2017 -0400
@@ -6,7 +6,7 @@
 function eff; nvim ~/.config/fish/functions; end
 function eg; nvim ~/.gitconfig; end
 function eh; nvim ~/.hgrc; end
-function ei; nvim ~/Dropbox/inventory.markdown; end
+function ei; hg -R ~/src/inventory/ pull -u; and nvim ~/src/inventory/inventory.markdown; and hg -R ~/src/inventory/ ci -m 'Update inventory'; and hg -R ~/src/inventory/ push; end
 function ek; nvim ~/lib/dotfiles/keymando/keymandorc.rb; end
 function em; nvim ~/.mutt/muttrc; end
 function es; nvim ~/.slate; end
@@ -99,6 +99,9 @@
 
 set -g -x GPG_TTY (tty)
 
+set -g -x FZF_DEFAULT_COMMAND 'ffind'
+set -g -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
+
 function headed_java -d "Put Java into headed mode"
     echo "Changing _JAVA_OPTIONS"
     echo "from: $_JAVA_OPTIONS"
diff -r 816a02d790f8 -r 22b5581eba39 inputrc
--- a/inputrc	Fri Oct 06 11:52:28 2017 -0400
+++ b/inputrc	Sun Oct 08 15:31:38 2017 -0400
@@ -4,3 +4,5 @@
 set input-meta on 
 set output-meta on 
 set convert-meta off
+
+"\C-i": rlwrap-call-editor
diff -r 816a02d790f8 -r 22b5581eba39 vim/vimrc
--- a/vim/vimrc	Fri Oct 06 11:52:28 2017 -0400
+++ b/vim/vimrc	Sun Oct 08 15:31:38 2017 -0400
@@ -822,6 +822,17 @@
 " }}}
 " Filetype-specific ------------------------------------------------------- {{{
 
+" Arduino {{{
+
+augroup ft_arduino
+    au!
+
+    au FileType arduino setlocal noexpandtab shiftwidth=8 tabstop=8 softtabstop=8
+    au FileType arduino inoremap <buffer> ☃ <esc>A;<cr>
+    au FileType arduino inoremap <buffer> ☂ <esc>mzA;<esc>`z
+augroup END
+
+" }}}
 " Assembly {{{
 
 augroup ft_asm
@@ -1178,9 +1189,12 @@
     au FileType lisp inoremap <c-n> <c-x><c-o>
 
     " lol, vim ignores indentexpr if lisp is set
-    au FileType lisp setlocal nolisp
+    " au FileType lisp setlocal nolisp
     au FileType lisp setlocal iskeyword+=!,?,%,-
-    " au FileType lisp setlocal equalprg=lispindent
+
+    " stay with lispindent for now
+    au FileType lisp setlocal lisp
+    au FileType lisp setlocal equalprg=lispindent
 
     " scratch buffer
     au FileType lisp nnoremap <buffer> <leader><tab> :e scratch.lisp<cr>
@@ -2085,6 +2099,7 @@
     au FileType fish setlocal commentstring=#\ %s
     au FileType gnuplot setlocal commentstring=#\ %s
     au FileType cs setlocal commentstring=//\ %s
+    au FileType arduino setlocal commentstring=//\ %s
     au FileType pandabt setlocal commentstring=//\ %s
 augroup END
 
@@ -2662,7 +2677,7 @@
             \ "SPEED": 1
             \ }
 
-" let g:vlime_indent_keywords = {"foo": 2}
+" let g:vlime_indent_keywords = {"defsystem": 1}
 
 function! CleanVlimeWindows()
     call vlime#plugin#CloseWindow("preview")