# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1373917920 14400
# Node ID 68b8d179f0d44cc0284bd82dd5190da4d69aed02
# Parent  a3ff27f963ced7e7e1e024faab6b5c8d46557172
update

diff -r a3ff27f963ce -r 68b8d179f0d4 .hgsub
--- a/.hgsub	Tue Jul 02 17:18:56 2013 -0700
+++ b/.hgsub	Mon Jul 15 15:52:00 2013 -0400
@@ -8,6 +8,7 @@
 vim/bundle/clojure-static        = [git]git://github.com/guns/vim-clojure-static.git
 vim/bundle/commentary            = [git]git://github.com/tpope/vim-commentary.git
 vim/bundle/ctrlp                 = [git]git://github.com/kien/ctrlp.vim.git
+vim/bundle/dispatch              = [git]git://github.com/tpope/vim-dispatch.git
 vim/bundle/fireplace             = [git]git://github.com/tpope/vim-fireplace.git
 vim/bundle/fugitive              = [git]git://github.com/tpope/vim-fugitive.git
 vim/bundle/gundo                 = [hg]https://bitbucket.org/sjl/gundo.vim/
@@ -16,8 +17,10 @@
 vim/bundle/javascript            = [git]git://github.com/pangloss/vim-javascript.git
 vim/bundle/linediff              = [git]git://github.com/AndrewRadev/linediff.vim.git
 vim/bundle/markdown              = [git]git://github.com/tpope/vim-markdown.git
+vim/bundle/maven                 = [git]git://github.com/sjl/vim-maven-plugin.git
 vim/bundle/nerdtree              = [git]git://github.com/scrooloose/nerdtree.git
 vim/bundle/paredit               = [hg]https://bitbucket.org/kovisoft/paredit/
+vim/bundle/pgsql                 = [git]git://github.com/exu/pgsql.vim.git
 vim/bundle/powerline             = [git]git://github.com/Lokaltog/vim-powerline.git
 vim/bundle/python-mode           = [git]git://github.com/klen/python-mode.git
 vim/bundle/rainbow-parentheses   = [git]git://github.com/kien/rainbow_parentheses.vim.git
diff -r a3ff27f963ce -r 68b8d179f0d4 .hgsubstate
--- a/.hgsubstate	Tue Jul 02 17:18:56 2013 -0700
+++ b/.hgsubstate	Mon Jul 15 15:52:00 2013 -0400
@@ -8,16 +8,19 @@
 949adf73ae1a82c48cd951677c055bd38a30af99 vim/bundle/clojure-static
 dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
 c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp
+ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch
 b96ccf7441ada22d764af8223b61f18896d82dc9 vim/bundle/fireplace
 cff78c3ab4605d490e6be8d8af02f1e7efd25c95 vim/bundle/fugitive
-8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo
+eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
 34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
 395f8901b34cc871c9576886938a6efda0eb7268 vim/bundle/javascript
 78646801aac4d3d85e7c4e9570deccfce81a50e7 vim/bundle/linediff
 dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
+5258393bb12428c59bce8b28c9726d0326805dcf vim/bundle/maven
 a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
 b6b7d8b1982b67a0bba936c198041f6f3a2286a4 vim/bundle/paredit
+f84e170fce4f6cb60b6d1b4baa30076f2b372f1e vim/bundle/pgsql
 2af074850fde676743f655775e3e151925751adf vim/bundle/powerline
 1b4b8f1a8f1c88d8caae6c1b12c22c52ef418f32 vim/bundle/python-mode
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
diff -r a3ff27f963ce -r 68b8d179f0d4 bin/figlet-find-font
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/figlet-find-font	Mon Jul 15 15:52:00 2013 -0400
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+ls /usr/local/share/figlet/fonts/ | grep -e 'fl[fc]' | xargs -J FONT -n1 figlet-out FONT "$@"
diff -r a3ff27f963ce -r 68b8d179f0d4 bin/figlet-out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/figlet-out	Mon Jul 15 15:52:00 2013 -0400
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo
+echo ====================================================================
+FONT=$1
+echo $FONT
+shift
+figlet -w 1000 -f $FONT "$@"
diff -r a3ff27f963ce -r 68b8d179f0d4 bin/maven
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/maven	Mon Jul 15 15:52:00 2013 -0400
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -e
+
+mvn "$@" | grcat ~/.grc/conf.maven
diff -r a3ff27f963ce -r 68b8d179f0d4 dotcss/simple.com.css
--- a/dotcss/simple.com.css	Tue Jul 02 17:18:56 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#intro-progress { display: none; }
-.badge.showing { display: none; }
diff -r a3ff27f963ce -r 68b8d179f0d4 fish/config.fish
--- a/fish/config.fish	Tue Jul 02 17:18:56 2013 -0700
+++ b/fish/config.fish	Mon Jul 15 15:52:00 2013 -0400
@@ -24,6 +24,8 @@
 function eg; vim ~/.gitconfig; end
 function es; vim ~/.slate; end
 
+function sjoin -d "Join input lines into a single line with spaces"; tr '\n' ' '; end
+
 function pj
     python -m json.tool | pygmentize -l json
 end
@@ -141,6 +143,11 @@
     ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=pack.txt $argv
 end
 
+function s
+    ~/lib/t/t.py --task-dir="~/.simple-tasks" --list=tasks.txt $argv
+    set -g T_TASK_COUNT (count_t_tasks)
+end
+
 # }}}
 # Bind Keys {{{
 
@@ -184,6 +191,7 @@
 prepend_to_path "$HOME/Library/Haskell/bin"
 prepend_to_path "/usr/local/Cellar/ruby/1.9.3-p194/bin"
 prepend_to_path "/Applications/Postgres.app/Contents/MacOS/bin"
+prepend_to_path "$HOME/.rbenv/shims"
 
 set BROWSER open
 
@@ -200,6 +208,8 @@
 
 set -g -x DRIP_SHUTDOWN 30
 
+set -g -x MAVEN_OPTS "-Xmx512M -XX:MaxPermSize=512M"
+
 # }}}
 # Python variables {{{
 
@@ -223,6 +233,11 @@
 . ~/.config/fish/virtualenv.fish
 
 # }}}
+# Rubby {{{
+
+/usr/local/bin/rbenv rehash 2>/dev/null
+
+# }}}
 # Z {{{
 
 . ~/src/z-fish/z.fish
@@ -339,7 +354,7 @@
 # Local Settings {{{
 
 if test -s $HOME/.config/fish/local.fish
-    source $HOME/.config/fish/local.fish
+    . $HOME/.config/fish/local.fish
 end
 
 # }}}
diff -r a3ff27f963ce -r 68b8d179f0d4 gitconfig
--- a/gitconfig	Tue Jul 02 17:18:56 2013 -0700
+++ b/gitconfig	Mon Jul 15 15:52:00 2013 -0400
@@ -72,6 +72,10 @@
 
     sl = "!sh -c 'git show --color=always $1 | less -R' -"
 
+    find-merge = "!sh -c 'git log $1..master --merges -n1' -"
+
+    fuck-up-history-from = pull --rebase
+
 [push]
     default = current
 
diff -r a3ff27f963ce -r 68b8d179f0d4 grc/conf.maven
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grc/conf.maven	Mon Jul 15 15:52:00 2013 -0400
@@ -0,0 +1,56 @@
+regexp=.+ FAILURE!$
+colours=red bold
+=======
+regexp=^Expected: .+$
+colours=magenta
+=======
+regexp=^     got: .+$
+colours=magenta
+=======
+regexp=^     but: .+$
+colours=magenta
+=======
+regexp= T E S T S
+colours=cyan bold
+=======
+regexp=^Running \w+$
+colours=cyan bold
+=======
+regexp=^Tests run: \d+,
+colours=cyan bold
+=======
+regexp=^Failed tests:
+colours=red bold
+=======
+regexp=Skipped: \d+,
+colours=yellow bold
+=======
+regexp=(Failures|Errors): \d+,
+colours=red bold
+=======
+regexp=Skipped: 0,?
+colours=green bold
+=======
+regexp=(Failures|Errors): 0,
+colours=green bold
+=======
+regexp=^\[INFO\] .*$
+colours=black bold
+=======
+regexp=.*logback.classic pattern.*
+colours=black bold
+=======
+regexp=^\[INFO\] BUILD SUCCESS$
+colours=green bold
+=======
+regexp=^\[INFO\] BUILD FAILURE$
+colours=red bold
+=======
+regexp=^\[debug\] .*$
+colours=black bold
+=======
+regexp=^SLF4J: .*$
+colours=black bold
+=======
+regexp=^log4j:.*$
+colours=black bold
diff -r a3ff27f963ce -r 68b8d179f0d4 mutt/muttrc
--- a/mutt/muttrc	Tue Jul 02 17:18:56 2013 -0700
+++ b/mutt/muttrc	Mon Jul 15 15:52:00 2013 -0400
@@ -119,65 +119,34 @@
 # }}}
 # steve@stevelosh.com {{{
 
-# # Default inbox.
-# set spoolfile = "+steve-stevelosh.com/INBOX"
-
-# # Alternate email addresses.
-# alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org
-
-# # Mailboxes to show in the sidebar.
-# mailboxes +steve-stevelosh.com/INBOX \
-#           +steve-stevelosh.com/vim \
-#           +steve-stevelosh.com/clojure \
-#           +steve-stevelosh.com/python \
-#           +steve-stevelosh.com/mercurial \
-#           +steve-stevelosh.com/archive \
-#           +steve-stevelosh.com/sent \
-#           +steve-stevelosh.com/drafts \
-#           +temporary/search \
-
-# # Other special folders.
-# set mbox      = "+steve-stevelosh.com/archive"
-# set postponed = "+steve-stevelosh.com/drafts"
-
-# # Sending email.
-# set from     = "steve@stevelosh.com"
-# set sendmail = "/usr/local/bin/msmtp -a stevelosh"
-# set sendmail_wait = 0 # no please don't silently fail, email is important
-# unset record
-
-# }}}
-# sjl@simple.com {{{
-
 # Default inbox.
-set spoolfile = "+simple/INBOX"
+set spoolfile = "+steve-stevelosh.com/INBOX"
 
 # Alternate email addresses.
-alternates slj@simple.com
+alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org
 
 # Mailboxes to show in the sidebar.
-mailboxes +simple/INBOX \
-          +simple/archive \
-          +simple/sent \
-          +simple/drafts \
-          +search \
+mailboxes +steve-stevelosh.com/INBOX \
+          +steve-stevelosh.com/vim \
+          +steve-stevelosh.com/clojure \
+          +steve-stevelosh.com/python \
+          +steve-stevelosh.com/mercurial \
+          +steve-stevelosh.com/archive \
+          +steve-stevelosh.com/sent \
+          +steve-stevelosh.com/drafts \
+          +temporary/search \
 
 # Other special folders.
-set mbox      = "+simple/archive"
-set postponed = "+simple/drafts"
+set mbox      = "+steve-stevelosh.com/archive"
+set postponed = "+steve-stevelosh.com/drafts"
 
 # Sending email.
-set from     = "sjl@simple.com"
-set sendmail = "/usr/local/bin/msmtp -a simple"
+set from     = "steve@stevelosh.com"
+set sendmail = "/usr/local/bin/msmtp -a stevelosh"
 set sendmail_wait = 0 # no please don't silently fail, email is important
 unset record
 
 # }}}
-# Account Hooks {{{
-
-# folder-hook steve-stevelosh.com/* source ~/.mutt/steve-stevelosh.com.muttrc
-
-# }}}
 # Key Bindings {{{
 
 # Index {{{
@@ -231,8 +200,8 @@
 macro pager s "<pipe-message>cat > ~/Desktop/"  "save message as"
 
 # Quickly change mailboxes
-macro pager \' "<exit><change-folder>+sjl-simple.com/INBOX<enter>"   "go to INBOX"
-macro pager \" "<exit><change-folder>+sjl-simple.com/archive<enter>" "go to archive"
+macro pager \' "<exit><change-folder>+steve-stevelosh.com/INBOX<enter>"   "go to INBOX"
+macro pager \" "<exit><change-folder>+steve-stevelosh.com/archive<enter>" "go to archive"
 
 # }}}
 # Compose {{{
@@ -254,3 +223,6 @@
 # }}}
 
 # }}}
+# Local Settings {{{
+    source `FILE=$HOME/.mutt-local; if [ ! -s "$FILE" ]; then FILE=/dev/null;fi;echo "$FILE"`
+# }}}
diff -r a3ff27f963ce -r 68b8d179f0d4 tmux/tmux.conf
--- a/tmux/tmux.conf	Tue Jul 02 17:18:56 2013 -0700
+++ b/tmux/tmux.conf	Mon Jul 15 15:52:00 2013 -0400
@@ -64,6 +64,8 @@
 # Only really makes sense if you have your parens bound to shifts like me.
 bind -r ( select-window -t :-
 bind -r ) select-window -t :+
+bind-key -r H swap-window -t -1
+bind-key -r L swap-window -t +1
 
 # 256 colors please
 set -g default-terminal "screen-256color"
diff -r a3ff27f963ce -r 68b8d179f0d4 vim/after/plugin/fireplace-map-unfucking.vim
--- a/vim/after/plugin/fireplace-map-unfucking.vim	Tue Jul 02 17:18:56 2013 -0700
+++ b/vim/after/plugin/fireplace-map-unfucking.vim	Mon Jul 15 15:52:00 2013 -0400
@@ -37,7 +37,8 @@
     au Filetype clojure nmap <buffer> M <Plug>FireplaceK
 
     " Go to Definition
-    au Filetype clojure nmap <buffer> gd <Plug>FireplaceDjump
+    au Filetype clojure nmap <buffer> <c-]> <Plug>FireplaceDjumpmzzvzz15<c-e>'z:Pulse<cr>
+    au Filetype clojure nmap <buffer> <c-\> <c-w>v<Plug>FireplaceDjumpmzzMzvzz15<c-e>'z:Pulse<cr>
 
     " Require
     au Filetype clojure nnoremap <buffer> <localleader>r :Require<cr>
@@ -48,11 +49,14 @@
     " Get [S]ource
     au Filetype clojure nmap <buffer> <localleader>s <Plug>FireplaceSource
 
+    " Eval Buffer
+    au Filetype clojure nnoremap <buffer> <localleader>eb :%Eval<cr>
+
     " Eval Form
     au Filetype clojure nmap <buffer> <localleader>ef <Plug>FireplacePrintab
 
     " Eval Top-Level Form
-    au Filetype clojure nmap <buffer> <localleader>ee mz:call PareditFindDefunBck()<cr><Plug>FireplacePrintab'z
+    au Filetype clojure nmap <buffer> <localleader>ee mz$:call PareditFindDefunBck()<cr><Plug>FireplacePrintab'z
 
     " Open clojure command line editor client window thing
     au Filetype clojure exe 'nmap <buffer> <localleader>E <Plug>FireplacePrompt' . &cedit . 'i'
diff -r a3ff27f963ce -r 68b8d179f0d4 vim/ftplugin/clojure/folding.vim
--- a/vim/ftplugin/clojure/folding.vim	Tue Jul 02 17:18:56 2013 -0700
+++ b/vim/ftplugin/clojure/folding.vim	Mon Jul 15 15:52:00 2013 -0400
@@ -3,47 +3,30 @@
 endif
 let loaded_clojurefolding=1
 
-let folded_forms = [
+if !exists('g:clojure_fold_extra')
+    let g:clojure_fold_extra = []
+endif
+
+let s:folded_forms = [
             \ 'def',
             \ 'defn',
             \ 'defn-',
-            \ 'defform',
-            \ 'defform-',
-            \ 'defrule',
             \ 'defprotocol',
-            \ 'defparser',
             \ 'defmacro',
             \ 'defmethod',
             \ 'defmulti',
             \ 'defonce',
-            \ 'defpage',
-            \ 'defmigration',
-            \ 'defsketch',
             \ 'defspec',
-            \ 'defremote',
             \ 'defrecord',
-            \ 'defrec',
             \ 'defpartial',
             \ 'extend-type',
             \ 'extend-protocol',
-            \ 'defgauge',
-            \ 'defmeter',
-            \ 'defhistogram',
-            \ 'defcounter',
-            \ 'deftimer',
             \ 'deftest',
-            \ 'defroutes',
-            \ 'defentity',
-            \ 'defaspect',
-            \ 'add-aspect',
-            \ 'defdb',
-            \ 'defproject',
-            \ 'defsynth',
-            \ 'definst',
             \ 'ns'
-            \ ]
-let s:form_re      = '\v^\((' . join(folded_forms, '|') . ')\s'
-let s:form_re_bare = '\v^\((' . join(folded_forms, '|') . ')$'
+            \ ] + g:clojure_fold_extra
+
+let s:form_re      = '\v^\((' . join(s:folded_forms, '|') . ')\s'
+let s:form_re_bare = '\v^\((' . join(s:folded_forms, '|') . ')$'
 
 function! s:NextNonBlankLineContents(start)
     let lnum = a:start
diff -r a3ff27f963ce -r 68b8d179f0d4 vim/vimrc
--- a/vim/vimrc	Tue Jul 02 17:18:56 2013 -0700
+++ b/vim/vimrc	Mon Jul 15 15:52:00 2013 -0400
@@ -58,7 +58,6 @@
 set showbreak=↪
 set splitbelow
 set splitright
-set fillchars=diff:⣿,vert:│
 set autowrite
 set autoread
 set shiftround
@@ -68,6 +67,12 @@
 set spellfile=~/.vim/custom-dictionary.utf-8.add
 set colorcolumn=+1
 
+" iTerm2 is currently slow as ball at rendering the nice unicode lines, so for
+" now I'll just use ascii pipes.  They're ugly but at least I won't want to kill
+" myself when trying to move around a file.
+" set fillchars=diff:⣿,vert:│
+set fillchars=diff:⣿,vert:\|
+
 " Don't try to highlight lines longer than 800 characters.
 set synmaxcol=800
 
@@ -613,6 +618,37 @@
 " }}}
 " Clojure {{{
 
+let g:clojure_fold_extra = [
+            \ 'defgauge',
+            \ 'defmeter',
+            \ 'defhistogram',
+            \ 'defcounter',
+            \ 'deftimer',
+            \
+            \ 'defdb',
+            \ 'defentity',
+            \ 'defaspect',
+            \ 'add-aspect',
+            \ 'defmigration',
+            \
+            \ 'defsynth',
+            \ 'definst',
+            \ 'defproject',
+            \
+            \ 'defroutes',
+            \
+            \ 'defrec',
+            \
+            \ 'defparser',
+            \
+            \ 'defform',
+            \ 'defform-',
+            \
+            \ 'defpage',
+            \ 'defsketch'
+            \
+            \ ]
+
 augroup ft_clojure
     au!
 
@@ -928,6 +964,17 @@
 augroup END
 
 " }}}
+" Postgresql {{{
+
+augroup ft_postgres
+    au!
+
+    au BufNewFile,BufRead *.sql set filetype=pgsql
+    au FileType pgsql set foldmethod=indent
+    au FileType pgsql set softtabstop=2 shiftwidth=2
+augroup END
+
+" }}}
 " Puppet {{{
 
 augroup ft_puppet
@@ -997,6 +1044,8 @@
 augroup ft_scala
     au!
     au Filetype scala setlocal foldmethod=indent
+    au Filetype scala compiler maven
+    au Filetype scala let b:dispatch = 'mvn -B package install'
 augroup END
 
 " }}}
@@ -1108,8 +1157,16 @@
 let g:ctrlp_user_command = ['.git/', my_ctrlp_ffind_command, my_ctrlp_ffind_command]
 
 " }}}
+" Dispatch {{{
+
+nnoremap <leader>d :Dispatch<cr>
+nnoremap <leader>m :Dispatch<cr>
+
+" }}}
 " Fugitive {{{
 
+let g:fugitive_github_domains = ['github.banksimple.com']
+
 nnoremap <leader>gd :Gdiff<cr>
 nnoremap <leader>gs :Gstatus<cr>
 nnoremap <leader>gw :Gwrite<cr>
@@ -1173,6 +1230,11 @@
 nnoremap \| :call MakeGreen('')<cr>
 
 " }}}
+" Maven {{{
+
+let g:maven_disable_mappings = 1
+
+" }}}
 " NERD Tree {{{
 
 noremap  <F2> :NERDTreeToggle<cr>
@@ -1559,7 +1621,7 @@
     diffupdate
 endfunc
 
-nnoremap <leader>dw :call ToggleDiffWhitespace()<CR>
+nnoremap <leader>W :call ToggleDiffWhitespace()<CR>
 
 " }}}
 " Error Toggles {{{
diff -r a3ff27f963ce -r 68b8d179f0d4 weechat/weechat.conf
--- a/weechat/weechat.conf	Tue Jul 02 17:18:56 2013 -0700
+++ b/weechat/weechat.conf	Mon Jul 15 15:52:00 2013 -0400
@@ -18,7 +18,7 @@
 bar_more_right = ">>"
 bar_more_up = "--"
 buffer_notify_default = all
-buffer_time_format = "%H:%M:%S"
+buffer_time_format = "%H:%M"
 color_basic_force_bold = off
 color_inactive_buffer = off
 color_inactive_message = on
@@ -35,7 +35,7 @@
 day_change_time_format = "%a, %d %b %Y"
 eat_newline_glitch = off
 highlight = "sjl"
-highlight_regex = "(sjl|^all[,:])"
+highlight_regex = "(sjl|^all[,:]|backend(ia?)|slj|clojerks)"
 highlight_tags = ""
 hotlist_add_buffer_if_away = on
 hotlist_buffer_separator = ", "
@@ -227,7 +227,7 @@
 nicklist.conditions = "nicklist"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = off
+nicklist.hidden = on
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200