# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1329340913 18000
# Node ID f566ff4e5c8a81147528b37ae2d5fd3c94580851
# Parent  1287b23ee8c3434012c5afe459cc23663d5516d1
Moar.

diff -r 1287b23ee8c3 -r f566ff4e5c8a .ctags
--- a/.ctags	Mon Feb 13 09:10:28 2012 -0500
+++ b/.ctags	Wed Feb 15 16:21:53 2012 -0500
@@ -17,3 +17,5 @@
 --exclude=venv
 --exclude=static-cache
 --exclude=closure-library
+
+--langmap=Lisp:+.clj
diff -r 1287b23ee8c3 -r f566ff4e5c8a .hgsubstate
--- a/.hgsubstate	Mon Feb 13 09:10:28 2012 -0500
+++ b/.hgsubstate	Wed Feb 15 16:21:53 2012 -0500
@@ -2,10 +2,10 @@
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
-9d9e466f24c36dc707e862d90a93f6c1a277a41d vim/bundle/badwolf
+86d478579d882c5bb925dd0b0a3aa5d180c324dd vim/bundle/badwolf
 93cb20dbfbab723e1557801469ae70f4f46499da vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
-b4b75ef682da3e946c648d3634ade39d0af49aba vim/bundle/fugitive
+03e138c3496926b193402f4e1542f0a99924f999 vim/bundle/fugitive
 a860f15c7226ee5b352303c5032732a423409932 vim/bundle/gundo
 4ef2d418f48d30fed2f7ce00f598d6871a0010fe vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
diff -r 1287b23ee8c3 -r f566ff4e5c8a .pentadactylrc
--- a/.pentadactylrc	Mon Feb 13 09:10:28 2012 -0500
+++ b/.pentadactylrc	Wed Feb 15 16:21:53 2012 -0500
@@ -15,14 +15,20 @@
 set followhints=1
 set showtabline=multitab
 set showstatuslinks=command
+
 set mapleader=','
 
 " FASTER PLEASE
 nnoremap j 3j
 nnoremap k 3k
 
+" Go to the second input field.
+" Useful for skipping over search fields, etc.
 nnoremap gI 2gi
-nnoremap gO gn
+
+" I never use marks, but always use quickmarks.
+nnoremap "'" go
+nnoremap '"' gn
 
 " Switch tabs with J and K
 nnoremap J :tn<CR>
@@ -32,9 +38,11 @@
 " nnoremap <c-f> <f12>
 " nnoremap <c-g> <s-f12>
 
+" Console toggle
 nnoremap <c-g> <m-a-k><esc>
 inoremap <c-g> <esc><m-a-k><esc>
 
+" Inspect element toggle
 nnoremap <c-f> <m-a-i>
 inoremap <c-f> <esc><m-a-i>
 
diff -r 1287b23ee8c3 -r f566ff4e5c8a keyremap4macbook/private.xml
--- a/keyremap4macbook/private.xml	Mon Feb 13 09:10:28 2012 -0500
+++ b/keyremap4macbook/private.xml	Wed Feb 15 16:21:53 2012 -0500
@@ -13,16 +13,16 @@
 
     <list>
         <item>
-            <name>Shift_R to Shift_R</name>
-            <appendix>(+ When you type shift_R only without other modifiers, send cmd+right)</appendix>
-            <identifier>private.shiftL2shiftR</identifier>
-            <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_R | ModifierFlag::NONE, KeyCode::SHIFT_R, KeyCode::CURSOR_RIGHT, ModifierFlag::COMMAND_L</autogen>
-        </item>
-        <item>
-            <name>Shift_L to Shift_L</name>
-            <appendix>(+ When you type shift_L only without other modifiers, send opt+left)</appendix>
-            <identifier>private.shiftL2shiftL</identifier>
-            <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_L | ModifierFlag::NONE, KeyCode::SHIFT_L, KeyCode::CURSOR_LEFT, ModifierFlag::OPTION_L</autogen>
+            <name>Shifts to Parentheses</name>
+            <appendix>Shifts, when pressed alone, type parentheses.  When used with other keys they're normal shifts.</appendix>
+
+            <identifier>private.shifts_to_parens</identifier>
+
+            <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_R | ModifierFlag::NONE, KeyCode::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L</autogen>
+            <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_L | ModifierFlag::NONE,    KeyCode::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
+
+            <autogen>--KeyToKey-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L</autogen>
+            <autogen>--KeyToKey-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L, KeyCode::KEY_0, ModifierFlag::SHIFT_L</autogen>
         </item>
     </list>
 
diff -r 1287b23ee8c3 -r f566ff4e5c8a vim/.vimrc
--- a/vim/.vimrc	Mon Feb 13 09:10:28 2012 -0500
+++ b/vim/.vimrc	Wed Feb 15 16:21:53 2012 -0500
@@ -374,8 +374,9 @@
     au BufNewFile,BufReadPost SLIMV.REPL nnoremap <buffer> A GA
     au BufNewFile,BufReadPost SLIMV.REPL nnoremap <buffer> <localleader>R :emenu REPL.<Tab>
 
-    " Fix the eval mapping.
-    au FileType clojure nmap <buffer> \ee \ed
+    " Fix the eval mappings.
+    au FileType clojure nnoremap <buffer> <localleader>ef :<c-u>call SlimvEvalExp()<cr>
+    au FileType clojure nnoremap <buffer> <localleader>ee :<c-u>call SlimvEvalDefun()<cr>
 
     " And the inspect mapping.
     au FileType clojure nmap <buffer> \i \di
@@ -581,6 +582,15 @@
 augroup END
 
 " }}}
+" Mail {{{
+
+augroup ft_mail
+    au!
+
+    au Filetype mail setlocal spell
+augroup END
+
+" }}}
 " Markdown {{{
 
 augroup ft_markdown
@@ -685,6 +695,16 @@
 augroup END
 
 " }}}
+" Scheme {{{
+
+augroup ft_scheme
+    au!
+
+    " Send current toplevel form to dtach.
+    au FileType scheme nnoremap <buffer> \ee mz:call SelectToplevelForm()<cr>:call SendToDtach(1)<cr>`z
+augroup END
+
+" }}}
 " Vagrant {{{
 
 augroup ft_vagrant
@@ -1233,10 +1253,10 @@
 
 " Shortcut for [] {{{
 
-onoremap id i[
-onoremap ad a[
-vnoremap id i[
-vnoremap ad a[
+onoremap ir i[
+onoremap ar a[
+vnoremap ir i[
+vnoremap ar a[
 
 " }}}
 " Next and Last {{{
@@ -1261,7 +1281,7 @@
       let c = "("
   elseif c ==# "B"
       let c = "{"
-  elseif c ==# "d"
+  elseif c ==# "r"
       let c = "["
   endif
 
@@ -1606,7 +1626,15 @@
 endfunction
 
 
-nnoremap <localleader>e :call SendToDtach(0)
-vnoremap <localleader>e :call SendToDtach(1)
+nnoremap <localleader>ee :call SendToDtach(0)
+vnoremap <localleader>ee :call SendToDtach(1)
+nnoremap <localleader>eb mqggvG:call SendToDtach(1)`q
 
 " }}}
+" Fake Paredit ------------------------------------------------------------ {{{
+
+" TODO: Make this stuff not suck.
+nnoremap <leader>> xEp
+nnoremap <leader>< xgEp
+
+" }}}
diff -r 1287b23ee8c3 -r f566ff4e5c8a zsh/misc.zsh
--- a/zsh/misc.zsh	Mon Feb 13 09:10:28 2012 -0500
+++ b/zsh/misc.zsh	Wed Feb 15 16:21:53 2012 -0500
@@ -80,6 +80,7 @@
 alias dv='dvtm -m "^f"'
 alias dvt='dtach -A /tmp/dvtm-session.sock -r winch dvtm -m "^f"'
 alias swank='dtach -A /tmp/dtach-swank.sock -r winch lein swank'
+alias target='dtach -A /tmp/target -r winch zsh'
 alias us-solr='wo unisubs && dtach -A /tmp/dtach-unisubs-solr.sock -r winch python manage.py run_solr --settings=dev_settings'
 
 alias goawayswapfilesyouareswapfilesidontevenneedyou='rm ~/.vim/tmp/swap/*'