--- a/.hgsub Tue Nov 08 13:26:09 2016 +0000
+++ b/.hgsub Thu Dec 15 12:45:59 2016 -0500
@@ -1,5 +1,4 @@
mercurial/hg-prompt = [hg]https://bitbucket.org/sjl/hg-prompt
-mercurial/histedit = [hg]https://bitbucket.org/durin42/histedit
mercurial/templates = [hg]https://bitbucket.org/sjl/mercurial-cli-templates
vim/bundle/AnsiEsc.vim = [git]git://github.com/sjl/AnsiEsc.vim.git
vim/bundle/abolish = [git]git://github.com/tpope/vim-abolish.git
--- a/.hgsubstate Tue Nov 08 13:26:09 2016 +0000
+++ b/.hgsubstate Thu Dec 15 12:45:59 2016 -0500
@@ -1,6 +1,5 @@
5334581e231a5167d03689ff47b3a6fdf082011c mercurial/hg-prompt
-b0da16490f168f68072973b45dbc27a74fb7b529 mercurial/histedit
-4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
+1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
64981213be2efd939e6e6e109e2b32c24e95fd95 vim/bundle/AnsiEsc.vim
d64ce06650cf9b098b5a01c0db53864965d9310b vim/bundle/abolish
f183a345a0c10caed7684d07dabae33e007c7590 vim/bundle/ack
@@ -10,7 +9,7 @@
54deda1ad27d7def8fbfebc03ae583f4b0752dd9 vim/bundle/asmx86
7d56e6fbb1b352c35baed5978a1a249875908dc9 vim/bundle/badwolf
2975b6f50397cc4912f04e3986906eca8fa441e7 vim/bundle/bencode
-bd953da766180c9197e0abad7eae716d9dea56e8 vim/bundle/clam
+a4d79fc208764917cb58e2aed6fbaeb5e3356d33 vim/bundle/clam
f1c53e290b16885c2eb3fc96e57d9984b627f735 vim/bundle/clojure-static
dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
@@ -54,4 +53,4 @@
d143308c5f385cce76dba5abf7b8b3737d711a4f vim/bundle/tslime2
4367cf0727c8c7de9f7f056825e0dc04f8981f35 vim/bundle/vim-completes-me
5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
-46787f593a85b28e7895946b7311754eb74237b6 vim/bundle/vitality
+59d187e792b5a3007d04682c9b5f6ce17e189dd0 vim/bundle/vitality
--- a/fish/config.fish Tue Nov 08 13:26:09 2016 +0000
+++ b/fish/config.fish Thu Dec 15 12:45:59 2016 -0500
@@ -125,10 +125,10 @@
prepend_to_path "/usr/local/Cellar/python/2.6.5/bin"
set -g -x PYTHONPATH ""
-set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.7.1/site-packages"
-set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
-set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
-set PYTHONPATH "$HOME/lib/python/see:$PYTHONPATH"
+# set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.7.1/site-packages"
+# set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
+# set PYTHONPATH "$PYTHONPATH:/usr/local/lib/python2.6/site-packages"
+# set PYTHONPATH "$HOME/lib/python/see:$PYTHONPATH"
set PYTHONPATH "$HOME/lib/hg/hg:$PYTHONPATH"
set -gx WORKON_HOME "$HOME/lib/virtualenvs"
@@ -181,8 +181,6 @@
function fish_prompt
set last_status $status
- z --add "$PWD"
-
echo
set_color magenta
--- a/gitconfig Tue Nov 08 13:26:09 2016 +0000
+++ b/gitconfig Thu Dec 15 12:45:59 2016 -0500
@@ -87,6 +87,8 @@
fuck-up-history-from = pull --rebase
+ import-patch = am
+
g = !git fuum
--- a/hgrc Tue Nov 08 13:26:09 2016 +0000
+++ b/hgrc Thu Dec 15 12:45:59 2016 -0500
@@ -21,7 +21,6 @@
fetch =
shelve =
prompt = ~/lib/dotfiles/mercurial/hg-prompt/prompt.py
-histedit = ~/lib/dotfiles/mercurial/histedit/hg_histedit.py
hggit = ~/.hg-git/hggit
[progress]
--- a/lispwords Tue Nov 08 13:26:09 2016 +0000
+++ b/lispwords Thu Dec 15 12:45:59 2016 -0500
@@ -17,8 +17,6 @@
(1 make-instance)
(1 dis)
(1 do-array)
-(1 recursively)
-(2 when-found)
; fiveam
(1 test)
@@ -70,3 +68,15 @@
; smug
(1 .let*)
+
+; cl-losh
+(1 recursively)
+(2 when-found)
+(1 when-let*)
+(1 multiple-value-bind*)
+
+; qtools
+(1 qtenumcase)
+
+; portaudio
+(1 with-default-audio-stream)
--- a/sbclrc Tue Nov 08 13:26:09 2016 +0000
+++ b/sbclrc Thu Dec 15 12:45:59 2016 -0500
@@ -22,6 +22,7 @@
(princ *cached-prompt* stream))
(setf sb-int:*repl-prompt-fun* #'package-prompt)
+(setf sb-debug:*debug-beginner-help-p* nil)
; '(ql:update-client)' --eval '(ql:update-all-dists)'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/shen/ftdetect/shen.vim Thu Dec 15 12:45:59 2016 -0500
@@ -0,0 +1,1 @@
+au BufNewFile,BufRead *.shen set filetype=shen
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/shen/ftplugin/shen.vim Thu Dec 15 12:45:59 2016 -0500
@@ -0,0 +1,11 @@
+if exists("b:did_ftplugin")
+ finish
+endif
+let b:did_ftplugin = 1
+
+setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$
+
+setlocal comments=n:\\\\
+setlocal commentstring=\\\\\ %s
+
+setlocal lisp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/shen/syntax/shen.vim Thu Dec 15 12:45:59 2016 -0500
@@ -0,0 +1,14 @@
+if exists("b:current_syntax")
+ finish
+endif
+
+syntax keyword shenKeyword define
+
+syntax keyword shenCommentTodo contained TODO TODO: todo todo:
+syntax match shenComment "\v\\\\.*$" contains=shenCommentTodo
+
+highlight default link shenKeyword Keyword
+highlight default link shenComment Comment
+highlight default link shenCommentTodo Todo
+
+let b:current_syntax = "shen"
--- a/vim/ftplugin/lisp/lispfolding.vim Tue Nov 08 13:26:09 2016 +0000
+++ b/vim/ftplugin/lisp/lispfolding.vim Thu Dec 15 12:45:59 2016 -0500
@@ -165,7 +165,7 @@
" let over lambda
return ">1"
elseif getline(a:lnum) =~ '^(in-package'
- return ">1"
+ return "0"
elseif getline(a:lnum) =~ '^(adt:defdata'
return ">1"
elseif getline(a:lnum) =~ '^(opts:define-opts'
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/ftplugin/shen/lispfolding.vim Thu Dec 15 12:45:59 2016 -0500
@@ -0,0 +1,1 @@
+../lisp/lispfolding.vim
\ No newline at end of file
--- a/vim/vimrc Tue Nov 08 13:26:09 2016 +0000
+++ b/vim/vimrc Thu Dec 15 12:45:59 2016 -0500
@@ -1058,6 +1058,10 @@
au FileType lisp nnoremap <buffer> <silent> <localleader>oa :call OpenLispReplABCL()<cr>
au FileType lisp nnoremap <buffer> <silent> <localleader>s :call SendToplevelLispForm()<cr>
au FileType lisp nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw("nil\n")<cr>:sleep 20m<cr>:call NeoReplSendRaw(" ")<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>0 :call NeoReplSendRaw("0\n")<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>1 :call NeoReplSendRaw("1\n")<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>2 :call NeoReplSendRaw("2\n")<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>3 :call NeoReplSendRaw("3\n")<cr>
au FileType lisp nnoremap <buffer> gi :call IndentToplevelLispForm()<cr>
au FileType lisp nnoremap <buffer> <silent> <localleader>d :call DisassembleLispSymbol()<cr>
au FileType lisp nnoremap <buffer> <silent> <localleader>q :call QuickloadLispSystem()<cr>
@@ -1771,6 +1775,72 @@
augroup END
" }}}
+" Shen {{{
+
+" Helper Functions {{{
+function! HighlightShenRepl() "{{{
+ syn match replPrompt /\v^\(\d+-\)/
+ " syn match replComment /\v^;.*/
+
+ " syn match replResult /\v^#\<[^>]+\>$/
+ hi def link replResult Debug
+ hi def link replComment Comment
+endfunction "}}}
+
+function! OpenShenRepl() "{{{
+ NeoRepl rlwrap ./shen
+ call HighlightShenRepl()
+endfunction "}}}
+
+function! SetShenLispWords() "{{{
+ if exists("b:did_set_lisp_words")
+ return
+ endif
+
+ let b:did_set_lisp_words = 1
+
+ " setlocal lispwords+=block
+endfunction "}}}
+" }}}
+
+augroup ft_shen " {{{
+ au!
+
+ " au FileType shen nnoremap <buffer> U :syntax sync fromstart<cr>:redraw!<cr>:call TurnOnLispFolding()<cr>
+
+ au FileType shen call SetShenLispWords()
+ au FileType shen call EnableParedit()
+ au FileType shen silent! call TurnOnLispFolding()
+
+ " au FileType shen RainbowParenthesesActivate
+ " au syntax shen RainbowParenthesesLoadRound
+
+ " au FileType shen setlocal equalprg=lispindent
+
+ " Handy stuff
+ au FileType shen nnoremap <buffer> [] :call DuplicateLispForm()<cr>
+
+ " s/it/happening/
+ "
+ " Map the Ooze keys, then add a few extra on top to work with the REPL.
+ "
+ " [o]pen repl
+ " [s]end to repl
+ " [c]lear repl
+ au FileType shen nnoremap <buffer> <silent> <localleader>o :call OpenShenRepl()<cr>
+ au FileType shen nnoremap <buffer> <silent> <localleader>e :call SendToplevelLispForm()<cr>
+ au FileType shen nnoremap <buffer> <silent> <localleader>c :call NeoReplSendRaw(" ")<cr>
+ au FileType shen nnoremap <buffer> gi :call IndentToplevelLispForm()<cr>
+
+ " Navigate trees of sexps with arrows
+ au FileType shen call s:vim_sexp_mappings()
+ au FileType shen noremap <buffer> <left> :<c-u>call SexpBack()<cr>
+ au FileType shen noremap <buffer> <right> :<c-u>call SexpForward()<cr>
+ au FileType shen noremap <buffer> <up> :<c-u>call SexpUp()<cr>
+ au FileType shen noremap <buffer> <down> :<c-u>call SexpDown()<cr>
+augroup END " }}}
+
+" }}}
" Standard In {{{
augroup ft_stdin
@@ -1909,6 +1979,7 @@
vnoremap ! :ClamVisual<space>
let g:clam_autoreturn = 1
let g:clam_debug = 1
+let g:clam_winwidth = 84
" }}}
" Commentary {{{
@@ -2586,7 +2657,7 @@
" \hpd - hg push default
" \hpu - hg push upstream
" \hpg - hg push git
-" \hP - push everything lol
+" \hpp - push everything lol
"
" \hB - hg blame (current file)
" \hD - hg diff (current file)
@@ -2598,7 +2669,7 @@
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>
+nnoremap <leader>hpp :Start! hg paths -q \| xargs -n1 hg push<cr>
function! s:HgDiff() " {{{
diffthis