# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1453391458 0
# Node ID 8a1376b77b80d8302c312207091051cb1bc36113
# Parent  83aac563abc9d0116894ac61db2c63c9a05f72be
its a bird its a plane no its just a plane actually

diff -r 83aac563abc9 -r 8a1376b77b80 .hgsubstate
--- a/.hgsubstate	Wed Dec 09 17:49:02 2015 +0000
+++ b/.hgsubstate	Thu Jan 21 15:50:58 2016 +0000
@@ -17,7 +17,7 @@
 935a2cccd3065b1322fb2235285d42728600afdf vim/bundle/fugitive
 6e9f52a160e3d15060848a8f453bd1b5bfa70db2 vim/bundle/gnupg
 0d57b080f9fae8573c688b6679b31eb1666edc4c vim/bundle/gnuplot
-1be6a45c04c830b9b1841b4510a5651c5c2eafdb vim/bundle/gundo
+6577ac10e3249d48576a44732dd765650273eef1 vim/bundle/gundo
 34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
 d1f19733ff5594cf5d6fb498fc599f02326860a6 vim/bundle/jack
diff -r 83aac563abc9 -r 8a1376b77b80 bin/lein
--- a/bin/lein	Wed Dec 09 17:49:02 2015 +0000
+++ b/bin/lein	Thu Jan 21 15:50:58 2016 +0000
@@ -4,7 +4,7 @@
 # somewhere on your $PATH, like ~/bin. The rest of Leiningen will be
 # installed upon first run into the ~/.lein/self-installs directory.
 
-export LEIN_VERSION="2.5.2"
+export LEIN_VERSION="2.5.3"
 
 case $LEIN_VERSION in
     *SNAPSHOT) SNAPSHOT="YES" ;;
@@ -83,7 +83,19 @@
   fi
 }
 
-if [ "$(id -u)" -eq 0 ] && [ "$LEIN_ROOT" = "" ]; then
+function check_root {
+  local -i user_id
+  # Thank you for the complexity, Solaris
+  if [ `uname` = "SunOS" -a -x /usr/xpg4/bin/id ]; then
+    user_id=$(/usr/xpg4/bin/id -u 2>/dev/null || echo 0)
+  else
+    user_id=$(id -u 2>/dev/null || echo 0)
+  fi
+  [ $user_id -eq 0 -a "$LEIN_ROOT" = "" ] && return 0
+  return 1
+}
+
+if check_root; then
     echo "WARNING: You're currently running as root; probably by accident."
     echo "Press control-C to abort or Enter to continue as root."
     echo "Set LEIN_ROOT to disable this warning."
@@ -253,7 +265,7 @@
     fi
     if [ $SNAPSHOT = "YES" ]; then
         echo "The upgrade task is only meant for stable releases."
-        echo "See the \"Hacking\" section of the README."
+        echo "See the \"Bootstrapping\" section of CONTRIBUTING.md."
         exit 1
     fi
     if [ ! -w "$SCRIPT" ]; then
diff -r 83aac563abc9 -r 8a1376b77b80 ffignore
--- a/ffignore	Wed Dec 09 17:49:02 2015 +0000
+++ b/ffignore	Thu Jan 21 15:50:58 2016 +0000
@@ -1,10 +1,8 @@
 syntax:literal
 .DS_Store
-tags
-tags.bak
 cookbook
 banner.txt
 
 syntax:regex
-^./target$
-^./\w+-(client|wire|service)/target$
+^tags$
+^tags.bak$
diff -r 83aac563abc9 -r 8a1376b77b80 hgrc
--- a/hgrc	Wed Dec 09 17:49:02 2015 +0000
+++ b/hgrc	Thu Jan 21 15:50:58 2016 +0000
@@ -177,6 +177,8 @@
 o, = outgoing --graph --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
 i, = incoming --graph --style=$HOME/lib/dotfiles/mercurial/templates/map-cmdline.sglog
 
+# Incoming and Outgoing all in one
+inout = !figlet incoming | lolcat; "$HG" incoming $@; figlet outgoing | lolcat; echo; "$HG" outgoing $@
 
 # hg n .     -- show a summary of rev . without diff.
 # hg show .  -- show a summary of rev . with diff.
diff -r 83aac563abc9 -r 8a1376b77b80 vim/after/plugin/paredit.vim
--- a/vim/after/plugin/paredit.vim	Wed Dec 09 17:49:02 2015 +0000
+++ b/vim/after/plugin/paredit.vim	Thu Jan 21 15:50:58 2016 +0000
@@ -2,8 +2,8 @@
     au!
 
     " Quit fucking with my split-line mapping, paredit.
-    au Filetype lisp nnoremap <buffer> S i<cr><esc>^mwgk:silent! s/\v +$//<cr>:noh<cr>`w
+    au Filetype lisp,clojure,gdl nnoremap <buffer> S i<cr><esc>^mwgk:silent! s/\v +$//<cr>:noh<cr>`w
 
     " Also quit fucking with my save file mapping.
-    au FileType lisp nunmap <buffer> s
+    au FileType lisp,clojure,gdl nunmap <buffer> s
 augroup END
diff -r 83aac563abc9 -r 8a1376b77b80 vim/after/plugin/surround-mapping.vim
--- a/vim/after/plugin/surround-mapping.vim	Wed Dec 09 17:49:02 2015 +0000
+++ b/vim/after/plugin/surround-mapping.vim	Thu Jan 21 15:50:58 2016 +0000
@@ -1,5 +1,2 @@
 " Use the old surround.vim key.  I can't deal with the new one.
 xmap s <Plug>VSurround
-
-" Use S for something useful.
-vnoremap S :s/
diff -r 83aac563abc9 -r 8a1376b77b80 vim/bundle/ooze/plugin/ooze.vim
--- a/vim/bundle/ooze/plugin/ooze.vim	Wed Dec 09 17:49:02 2015 +0000
+++ b/vim/bundle/ooze/plugin/ooze.vim	Thu Jan 21 15:50:58 2016 +0000
@@ -1,4 +1,11 @@
 " vim: set foldmethod=indent
+" TODO: 
+" Unfuck folding
+" Disassembly mapping
+" in-package horseshit
+" error handling
+" multi-packet messages
+"
 
 function! s:IsString(a)
     return type(a:a) == 1
@@ -47,6 +54,11 @@
     let output .= s:GetString(a:msg, 'stdout', "")
     let output .= s:GetString(a:msg, 'stderr', "")
     let output .= s:GetString(a:msg, 'value', "")
+
+    let output .= s:GetString(a:msg, 'error', "\n\n")
+    let output .= s:GetString(a:msg, 'original', "\n\n")
+    let output .= s:GetString(a:msg, 'backtrace', "\n")
+
     let output .= s:GetString(a:msg, 'function-arglist', "\n\n")
     let output .= s:GetString(a:msg, 'function-docstring', "\n")
     if output != ''
@@ -161,8 +173,9 @@
     nnoremap <buffer> <localleader>f mzvab:<c-u>call OozeEvalSelection()<cr>`z
 
     nnoremap <buffer> <localleader>D :call OozeDocument(input("? "))<cr>
-    nnoremap <buffer> <localleader>d mzviw:<c-u>call OozeDocumentSelection()<cr>`z
+    " nnoremap <buffer> <localleader>d mzviw:<c-u>call OozeDocumentSelection()<cr>`z
     inoremap <buffer> <silent> <c-d> <esc>mzbviw:<c-u>call OozeDocumentSelection()<cr>`za
+    nnoremap <buffer> M mzviw:<c-u>call OozeDocumentSelection()<cr>`z
 
     nnoremap <buffer> <localleader>M :call OozeMacroexpand(input("? "))<cr>
     nnoremap <buffer> <localleader>m mzvab:<c-u>call OozeMacroexpandSelection()<cr>`z
diff -r 83aac563abc9 -r 8a1376b77b80 vim/vimrc
--- a/vim/vimrc	Wed Dec 09 17:49:02 2015 +0000
+++ b/vim/vimrc	Thu Jan 21 15:50:58 2016 +0000
@@ -309,15 +309,28 @@
 " For some reason Vim no longer wants to talk to the OS X pasteboard through "*.
 " Computers are bullshit.
 function! g:FuckingCopyTheTextPlease()
+    let view = winsaveview()
     let old_z = @z
     normal! gv"zy
     call system('pbcopy', @z)
     let @z = old_z
+    call winrestview(view)
 endfunction
+
+function! g:FuckingCopyAllTheTextPlease()
+    let view = winsaveview()
+    let old_z = @z
+    normal! ggVG"zy
+    call system('pbcopy', @z)
+    let @z = old_z
+    call winrestview(view)
+endfunction
+
 noremap <leader>p "*p
 " noremap <leader>p mz:r!pbpaste<cr>`z
 vnoremap <leader>y :<c-u>call g:FuckingCopyTheTextPlease()<cr>
 nnoremap <leader>y VV:<c-u>call g:FuckingCopyTheTextPlease()<cr>
+nnoremap <leader>Y :<c-u>call g:FuckingCopyAllTheTextPlease()<cr>
 
 " Reselect last-pasted text
 nnoremap gp `[v`]
@@ -413,6 +426,7 @@
 
 " Substitute
 nnoremap <c-s> :%s/
+vnoremap <c-s> :s/
 
 " HTML tag closing
 inoremap <C-_> <space><bs><esc>:call InsertCloseTag()<cr>a
@@ -711,6 +725,16 @@
 augroup ft_c
     au!
     au FileType c setlocal foldmethod=marker foldmarker={,}
+    au FileType c setlocal ts=8 sts=8 sw=8 noexpandtab
+augroup END
+
+" }}}
+" C++ {{{
+
+augroup ft_cpp
+    au!
+    au FileType cpp setlocal foldmethod=marker foldmarker={,}
+    au FileType cpp setlocal ts=8 sts=8 sw=8 noexpandtab
 augroup END
 
 " }}}
@@ -782,7 +806,7 @@
     au FileType clojure setlocal report=100000
 
     " Things that should be indented 2-spaced
-    au FileType clojure setlocal lispwords+=when-found,defform,when-valid,try
+    au FileType clojure setlocal lispwords+=when-found,defform,when-valid,try,while-let
 
     au FileType clojure RainbowParenthesesActivate
     au syntax clojure RainbowParenthesesLoadRound
@@ -841,18 +865,22 @@
     hi def link replResult Debug
 endfunction "}}}
 function! SetLispWords() "{{{
-    if exists("g:did_set_lisp_words")
+    setlocal isk+=.
+
+    if exists("b:did_set_lisp_words")
         return
     endif
 
-    let g:did_set_lisp_words = 1
-
-    set lispwords+=switch
-    set lispwords+=cswitch
-    set lispwords+=eswitch
-    set lispwords+=when-let
-    set lispwords+=optima:match
-    set lispwords+=match
+    let b:did_set_lisp_words = 1
+
+    setlocal lispwords+=switch
+    setlocal lispwords+=cswitch
+    setlocal lispwords+=eswitch
+    setlocal lispwords+=when-let
+    setlocal lispwords+=optima:match
+    setlocal lispwords+=match
+    setlocal lispwords+=match
+    setlocal lispwords+=.let*
 endfunction "}}}
 function! SendLispForm() "{{{
     let view = winsaveview()
@@ -925,34 +953,34 @@
     " \m - macroexpand form       [m]acroexpand
     " \M - macroexpand prompt     [m]acroexpand
 
-    au FileType lisp nnoremap <buffer> <silent> <localleader>o :call OpenLispRepl()<cr>
-
-    " Send the current form to the REPL
-    au FileType lisp nnoremap <buffer> <silent> <localleader>f :call SendLispForm()<cr>
-
-    " Send the current top-level form to the REPL
-    au FileType lisp nnoremap <buffer> <silent> <localleader>e :call SendToplevelLispForm()<cr>
-
-    " Send the entire buffer to the REPL ([r]eload)
-    au FileType lisp nnoremap <buffer> <silent> <localleader>r :call SendLispBuffer()<cr>
-
-    " Clear the REPL
-    au FileType lisp nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw("")<cr>
-
-    " Describe symbol under the cursor
-    au FileType lisp nnoremap <buffer> <silent> <localleader>d :call DescribeLispSymbol()<cr>
-
-    " Describe the last thing we typed
-    au FileType lisp inoremap <buffer> <silent> <c-d> <esc>mzb:call DescribeLispSymbol()<cr>`za
-
-    " Describe prompt
-    au FileType lisp nnoremap <buffer> <silent> <localleader>D :call DescribeLispPrompt()<cr>
-
-    " Macroexpand form
-    au FileType lisp nnoremap <buffer> <silent> <localleader>m :call MacroexpandLispForm()<cr>
-
-    " Macroexpand prompt
-    au FileType lisp nnoremap <buffer> <silent> <localleader>M :call MacroexpandLispPrompt()<cr>
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>o :call OpenLispRepl()<cr>
+
+    " " Send the current form to the REPL
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>f :call SendLispForm()<cr>
+
+    " " Send the current top-level form to the REPL
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>e :call SendToplevelLispForm()<cr>
+
+    " " Send the entire buffer to the REPL ([r]eload)
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>r :call SendLispBuffer()<cr>
+
+    " " Clear the REPL
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw("")<cr>
+
+    " " Describe symbol under the cursor
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>d :call DescribeLispSymbol()<cr>
+
+    " " Describe the last thing we typed
+    " au FileType lisp inoremap <buffer> <silent> <c-d> <esc>mzb:call DescribeLispSymbol()<cr>`za
+
+    " " Describe prompt
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>D :call DescribeLispPrompt()<cr>
+
+    " " Macroexpand form
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>m :call MacroexpandLispForm()<cr>
+
+    " " Macroexpand prompt
+    " au FileType lisp nnoremap <buffer> <silent> <localleader>M :call MacroexpandLispPrompt()<cr>
 
     au FileType lisp RainbowParenthesesActivate
     au syntax lisp RainbowParenthesesLoadRound
@@ -1125,6 +1153,44 @@
 augroup END
 
 " }}}
+" GDL {{{
+
+augroup ft_gdl
+    au!
+
+    au FileType gdl setlocal foldmethod=marker foldmarker={{{,}}} lisp iskeyword+=?
+
+    au FileType gdl RainbowParenthesesActivate
+    au syntax gdl RainbowParenthesesLoadRound
+
+    au FileType gdl call PareditInitBuffer()
+
+    au FileType gdl noremap <buffer> () :<c-u>call PareditWrap("(", ")")<cr>
+    au FileType gdl noremap <buffer> )( :<c-u>call PareditSplice()<cr>
+    au FileType gdl noremap <buffer> (( :<c-u>call PareditMoveLeft()<cr>
+    au FileType gdl noremap <buffer> )) :<c-u>call PareditMoveRight()<cr>
+    au FileType gdl noremap <buffer> (j :<c-u>call PareditJoin()<cr>
+    au FileType gdl noremap <buffer> (s :<c-u>call PareditSplit()<cr>
+    au FileType gdl noremap <buffer> )j :<c-u>call PareditJoin()<cr>
+    au FileType gdl noremap <buffer> )s :<c-u>call PareditSplit()<cr>
+    au FileType gdl noremap <buffer> [[ :<c-u>call PareditSmartJumpOpening(0)<cr>
+    au FileType gdl noremap <buffer> ]] :<c-u>call PareditSmartJumpClosing(0)<cr>
+    " ))
+augroup END
+
+" }}}
+" GLSL {{{
+
+augroup ft_glsl
+    au!
+
+    au BufNewFile,BufRead *.shader setlocal filetype=glsl
+
+    au FileType glsl setlocal foldmethod=marker foldmarker={,}
+    au FileType glsl setlocal ts=8 sts=8 sw=8 noexpandtab
+augroup END
+
+" }}}
 " gnuplot {{{
 
 function! OpenGnuplotRepl() "{{{
@@ -1820,6 +1886,7 @@
     au!
     au FileType htmldjango setlocal commentstring={#\ %s\ #}
     au FileType clojurescript setlocal commentstring=;\ %s
+    au FileType gdl setlocal commentstring=;\ %s
     au FileType lisp setlocal commentstring=;\ %s
     au FileType puppet setlocal commentstring=#\ %s
     au FileType fish setlocal commentstring=#\ %s
@@ -1881,6 +1948,46 @@
 nnoremap <leader>m :Dispatch<cr>
 
 " }}}
+" Fireplace {{{
+
+let g:fireplace_no_maps = 1
+
+augroup map_good_fireplace_keys
+    au!
+
+    " [M]an (get documentation)
+    au Filetype clojure nmap <buffer> M <Plug>FireplaceK
+
+    " Go to Definition
+    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>
+
+    " Require Harder
+    au Filetype clojure nnoremap <buffer> <localleader>R :Require!<cr>
+
+    " Get [S]ource
+    " au Filetype clojure nmap <buffer> <localleader>s <Plug>FireplaceSource
+
+    " Eval Buffer
+    au Filetype clojure nnoremap <buffer> <localleader>b :%Eval<cr>
+
+    " Eval Form
+    au Filetype clojure nmap <buffer> <localleader>f <Plug>FireplacePrintab
+
+    " Eval Top-Level Form
+    au Filetype clojure nmap <buffer> <localleader>e 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'
+
+    " [S]how Last Result
+    au Filetype clojure nnoremap <buffer> <localleader>s :Last<cr>
+augroup END
+
+" }}}
 " Fugitive {{{
 
 let g:fugitive_github_domains = ['github.banksimple.com']
@@ -2408,6 +2515,17 @@
   endif
 endfunction " }}}
 
+command! LocationToggle call LocationToggle()
+function! LocationToggle() " {{{
+  if exists("w:is_location_window")
+    unlet w:is_location_window
+    exec "q"
+  else
+    lopen
+    let w:is_location_window = 1
+  endif
+endfunction " }}}
+
 command! -bang -nargs=? QFixToggle call QFixToggle(<bang>0)
 function! QFixToggle(forced) " {{{
   if exists("g:qfix_win") && a:forced == 0
@@ -2421,6 +2539,7 @@
 
 nmap <silent> <f3> :ErrorsToggle<cr>
 nmap <silent> <f4> :QFixToggle<cr>
+" nmap <silent> <f3> :LocationToggle<cr>
 
 " }}}
 " Nyan! {{{
@@ -2549,6 +2668,8 @@
 "
 " \hpd - hg push default
 " \hpu - hg push upstream
+" \hpg - hg push git
+" \hP - push everything lol
 "
 " \hB - hg blame (current file)
 " \hD - hg diff (current file)
@@ -2559,6 +2680,8 @@
 
 nnoremap <leader>hpd :Start! hg push default<cr>
 nnoremap <leader>hpu :Start! hg push upstream<cr>
+nnoremap <leader>hpg :Start! hg push git<cr>
+nnoremap <leader>hP :Start! hg paths -q \| xargs -n1 hg push<cr>
 
 function! s:HgDiff() " {{{
     diffthis
diff -r 83aac563abc9 -r 8a1376b77b80 weechat/weechat.conf
--- a/weechat/weechat.conf	Wed Dec 09 17:49:02 2015 +0000
+++ b/weechat/weechat.conf	Thu Jan 21 15:50:58 2016 +0000
@@ -344,8 +344,8 @@
 meta-Ob = "/input history_global_next"
 meta-Oc = "/input move_next_word"
 meta-Od = "/input move_previous_word"
-meta2-15~ = "/buffer -1"
-meta2-17~ = "/buffer +1"
+meta2-15~ = "/bar scroll nicklist * y-100%"
+meta2-17~ = "/bar scroll nicklist * y+100%"
 meta2-18~ = "/window -1"
 meta2-19~ = "/window +1"
 meta2-1;3A = "/buffer -1"