# HG changeset patch # User Steve Losh # Date 1478611569 0 # Node ID b2ba5708c42031bbb0c87ca415cf28cc2b59b473 # Parent 8711abae3c3a3d053c28b77cd0ae2529ac0dfd85 More diff -r 8711abae3c3a -r b2ba5708c420 .hgsub --- a/.hgsub Wed Oct 12 16:13:06 2016 +0000 +++ b/.hgsub Tue Nov 08 13:26:09 2016 +0000 @@ -47,6 +47,7 @@ vim/bundle/splice = [hg]https://bitbucket.org/sjl/splice.vim vim/bundle/strftimedammit = [hg]https://bitbucket.org/sjl/strftimedammit.vim/ vim/bundle/surround = [git]git://github.com/tpope/vim-surround.git +vim/bundle/swig = [git]git://github.com/vim-scripts/SWIG-syntax.git vim/bundle/syntastic = [git]git://github.com/scrooloose/syntastic.git vim/bundle/targets = [git]git://github.com/wellle/targets.git vim/bundle/timl = [git]git://github.com/tpope/timl.git diff -r 8711abae3c3a -r b2ba5708c420 .hgsubstate --- a/.hgsubstate Wed Oct 12 16:13:06 2016 +0000 +++ b/.hgsubstate Tue Nov 08 13:26:09 2016 +0000 @@ -13,7 +13,7 @@ bd953da766180c9197e0abad7eae716d9dea56e8 vim/bundle/clam f1c53e290b16885c2eb3fc96e57d9984b627f735 vim/bundle/clojure-static dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary -c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp +c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch 1c75b56ceb96a6e7fb6708ae96ab63b3023bab2f vim/bundle/fireplace @@ -47,10 +47,11 @@ 287437b3bb6c4f21b4ed98443ede19db2a5b979c vim/bundle/splice 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c vim/bundle/surround +19c3d966440b6cfe8d74251881a48e961ddb8648 vim/bundle/swig cc6b92afa640db4342dc9ab9fd4215316888d6fa vim/bundle/syntastic f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets 01deb947b22201c8a3dfee5ae97b11228bd9cc36 vim/bundle/timl d143308c5f385cce76dba5abf7b8b3737d711a4f vim/bundle/tslime2 4367cf0727c8c7de9f7f056825e0dc04f8981f35 vim/bundle/vim-completes-me 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex -84365f56fc87c11f1f04eed487d256cf8b128f7c vim/bundle/vitality +46787f593a85b28e7895946b7311754eb74237b6 vim/bundle/vitality diff -r 8711abae3c3a -r b2ba5708c420 bin/quicklisp-update --- a/bin/quicklisp-update Wed Oct 12 16:13:06 2016 +0000 +++ b/bin/quicklisp-update Tue Nov 08 13:26:09 2016 +0000 @@ -1,3 +1,3 @@ #!/usr/bin/env bash -sbcl-rlwrap --eval '(ql:update-client)' --eval '(ql:update-all-dists)' --eval '(quit)' +sbcl --eval '(ql:update-client)' --eval '(ql:update-all-dists)' --eval '(quit)' diff -r 8711abae3c3a -r b2ba5708c420 fish/functions/clonedown.fish --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fish/functions/clonedown.fish Tue Nov 08 13:26:09 2016 +0000 @@ -0,0 +1,5 @@ +function clonedown -d "clone a repo down" + cd ~/src + git clone $argv + cd (echo "$argv" | sed -Ee 's_.*/__') +end diff -r 8711abae3c3a -r b2ba5708c420 lispwords --- a/lispwords Wed Oct 12 16:13:06 2016 +0000 +++ b/lispwords Tue Nov 08 13:26:09 2016 +0000 @@ -14,6 +14,7 @@ ; my own weird things (1 make-array) +(1 make-instance) (1 dis) (1 do-array) (1 recursively) @@ -22,8 +23,8 @@ ; fiveam (1 test) -; optima -(1 match ematch) +; optima/trivia +(1 match match* ematch ematch*) ; defstar (2 defun*) diff -r 8711abae3c3a -r b2ba5708c420 tmux/tmux.conf --- a/tmux/tmux.conf Wed Oct 12 16:13:06 2016 +0000 +++ b/tmux/tmux.conf Tue Nov 08 13:26:09 2016 +0000 @@ -10,6 +10,9 @@ # Shut up. set -g quiet on +# Focus +set -g focus-events + # Mouse set -g mouse on diff -r 8711abae3c3a -r b2ba5708c420 vim/bundle/ooze/plugin/ooze.vim --- a/vim/bundle/ooze/plugin/ooze.vim Wed Oct 12 16:13:06 2016 +0000 +++ b/vim/bundle/ooze/plugin/ooze.vim Tue Nov 08 13:26:09 2016 +0000 @@ -325,6 +325,26 @@ call winrestview(view) endfunction " }}} +function! OozeSpaceMap() " {{{ + if exists("b:ooze_vblock") || mode() == "R" + " Don't fuck with visual block mode or replace mode + return "\" + else + return "\\:\call OozeArglistFormHead()\a" + endif +endfunction " }}} +function! OozeTrackVblock() " {{{ + " end my life + let b:ooze_vblock = 1 + return "I" +endfunction " }}} +function! OozeUntrackVblock() " {{{ + " end my life + if exists("b:ooze_vblock") + unlet b:ooze_vblock + endif +endfunction " }}} + function! OozeMapKeys() " {{{ " [C]onnect and [K]ill nnoremap C :call OozeConnect() @@ -353,8 +373,12 @@ nnoremap r :call OozeLoadCurrent() " magic arglist shit - inoremap :call OozeArglistFormHead()a - " inoremap :call OozeArglistFormHead() + inoremap OozeSpaceMap() + vnoremap I OozeTrackVblock() + augroup ooze_vblock + au! + autocmd InsertLeave call OozeUntrackVblock() + augroup END endfunction " }}} augroup ooze_dev " {{{ @@ -368,4 +392,5 @@ " to disable it. au InsertEnter * :let g:ooze_save_showmode=&showmode au InsertLeave * :let &showmode=g:ooze_save_showmode + au InsertLeave * :let &showmode=g:ooze_save_showmode augroup END diff -r 8711abae3c3a -r b2ba5708c420 vim/vimrc --- a/vim/vimrc Wed Oct 12 16:13:06 2016 +0000 +++ b/vim/vimrc Tue Nov 08 13:26:09 2016 +0000 @@ -891,8 +891,9 @@ " optima setlocal lispwords+=optima:match - setlocal lispwords+=match - setlocal lispwords+=ematch + setlocal lispwords+=match,match*,defun-match,defun-match* + setlocal lispwords+=ematch,ematch*,defun-ematch,defun-ematch* + setlocal lispwords+=cmatch,cmatch*,defun-cmatch,defun-cmatch* " 1am setlocal lispwords+=test @@ -923,6 +924,7 @@ " more shit setlocal lispwords+=define-test + setlocal lispwords+=recursively endfunction "}}} function! SendLispForm() "{{{ @@ -990,7 +992,7 @@ endfunction " }}} function! QuickloadLispSystem() " {{{ - let systems = split(system('ls -1 *.asd | grep -v test')) + let systems = split(system('ls -1 *.asd | grep -v test | cut -d. -f1 | uniq')) " its fine if len(systems) == 0 echom "Could not find any .asd files..." return @@ -999,9 +1001,7 @@ return endif - let system = split(systems[0], '[.]')[0] - - call NeoReplSendRaw("(ql:quickload :" . system . ")\n") + call NeoReplSendRaw("(ql:quickload :" . systems[0] . ")\n") endfunction " }}} function! QuickloadLispPrompt() " {{{ call NeoReplSendRaw("(ql:quickload :" . input("? ") . ")\n") @@ -1013,8 +1013,9 @@ \ 'test>', \ 'eval-when>', \ - \ 'declaim' + \ 'declaim', \ + \ 'macro-map' \ ] " }}} @@ -1940,7 +1941,7 @@ let g:ctrlp_map = ',' nnoremap . :CtrlPTag -nnoremap E :CtrlP ../ +nnoremap b :CtrlPBuffer let g:ctrlp_prompt_mappings = { \ 'PrtSelectMove("j")': ['', '', ''], @@ -1950,25 +1951,8 @@ \ 'ToggleFocus()': [''], \ } -let ctrlp_filter_greps = "". - \ "egrep -iv '\\.(" . - \ "jar|class|swp|swo|log|so|o|pyc|jpe?g|png|gif|mo|po" . - \ ")$' | " . - \ "egrep -v '^(\\./)?(" . - \ "deploy/|lib/|classes/|libs/|deploy/vendor/|.git/|.hg/|.svn/|.*migrations/|docs/build/" . - \ ")'" - -let my_ctrlp_user_command = "" . - \ "find %s '(' -type f -or -type l ')' -maxdepth 15 -not -path '*/\\.*/*' | " . - \ ctrlp_filter_greps - -let my_ctrlp_git_command = "" . - \ "cd %s && git ls-files --exclude-standard -co | " . - \ ctrlp_filter_greps - let my_ctrlp_ffind_command = "ffind --semi-restricted --dir %s --type e -B -f" - -let g:ctrlp_user_command = ['.git/', my_ctrlp_ffind_command, my_ctrlp_ffind_command] +let g:ctrlp_user_command = my_ctrlp_ffind_command " }}} " DelimitMate {{{ @@ -2257,6 +2241,13 @@ nmap ]] (sexp_swap_element_forward) xmap ]] (sexp_swap_element_forward) + nmap { (sexp_move_to_prev_top_element) + xmap { (sexp_move_to_prev_top_element) + omap { (sexp_move_to_prev_top_element) + nmap } (sexp_move_to_next_top_element) + xmap } (sexp_move_to_next_top_element) + omap } (sexp_move_to_next_top_element) + " nmap ( (sexp_move_to_prev_bracket) " xmap ( (sexp_move_to_prev_bracket) " omap ( (sexp_move_to_prev_bracket) diff -r 8711abae3c3a -r b2ba5708c420 vimperatorrc --- a/vimperatorrc Wed Oct 12 16:13:06 2016 +0000 +++ b/vimperatorrc Tue Nov 08 13:26:09 2016 +0000 @@ -3,7 +3,7 @@ nnoremap k 6k " remove gui cruft -set gui=none,tabs +set gui=nonavigation,tabs " my eyes are bad highlight CmdLine font: normal 15px 'Menlo' !important; background: white !important; padding: 0px 10px 0px 0px; @@ -28,9 +28,10 @@ " Clear search highlighting and normal highlighting. nnoremap , :noh - " unfuck ublock style -name ublick * #nav-bar * { visibility: visible; } " unfuck completions for ff49 js services.services.autoCompleteSearch.class_="@mozilla.org/autocomplete/search;1?name=unifiedcomplete" + +normal