--- a/.hgsubstate Mon Jul 18 13:04:41 2016 +0000
+++ b/.hgsubstate Sat Aug 20 21:21:56 2016 +0000
@@ -9,7 +9,7 @@
6c4663589e73e21e77a9ea8403dcf2bf6cf9c11c vim/bundle/argumentative
54deda1ad27d7def8fbfebc03ae583f4b0752dd9 vim/bundle/asmx86
3264a4dae84dd046c7a7e6d8c5402a5c12e22455 vim/bundle/badwolf
-5d747e72d1f2e9bdd1d3f3a1375faabf5fe00313 vim/bundle/bencode
+2975b6f50397cc4912f04e3986906eca8fa441e7 vim/bundle/bencode
bd953da766180c9197e0abad7eae716d9dea56e8 vim/bundle/clam
f1c53e290b16885c2eb3fc96e57d9984b627f735 vim/bundle/clojure-static
dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary
--- a/bin/bootstrap.sh Mon Jul 18 13:04:41 2016 +0000
+++ b/bin/bootstrap.sh Sat Aug 20 21:21:56 2016 +0000
@@ -36,6 +36,7 @@
ensure_link "lib/dotfiles/weechat" ".weechat"
ensure_link "lib/dotfiles/urlview" ".urlview"
ensure_link "lib/dotfiles/pentadactylrc" ".pentadactylrc"
+ensure_link "lib/dotfiles/vimperatorrc" ".vimperatorrc"
ensure_link "lib/dotfiles/offlineimaprc" ".offlineimaprc"
ensure_link "lib/dotfiles/mutt" ".mutt"
ensure_link "lib/dotfiles/dotjs" ".js"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/scratch Sat Aug 20 21:21:56 2016 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+nvim ~/Dropbox/scratch
--- a/fish/functions/dump.fish Mon Jul 18 13:04:41 2016 +0000
+++ b/fish/functions/dump.fish Sat Aug 20 21:21:56 2016 +0000
@@ -10,12 +10,23 @@
hg -R ~/src/mazes push
hg -R ~/src/mazes push git
- hg -R ~/src/coding-math push
- hg -R ~/src/coding-math push git
+ hg -R ~/src/cl-ggp push
+ hg -R ~/src/cl-ggp push git
hg -R ~/src/sand push
+ hg -R ~/src/sand push git
hg -R ~/src/hype push
+ hg -R ~/src/hype push git
+
+ hg -R ~/src/cl-losh push
+ hg -R ~/src/cl-losh push git
+
+ hg -R ~/src/beast push
+ hg -R ~/src/beast push git
+
+ hg -R ~/src/vex push
+ hg -R ~/src/vex push git
hg -R ~/lib/dotfiles push
--- a/fish/functions/irclogs.fish Mon Jul 18 13:04:41 2016 +0000
+++ b/fish/functions/irclogs.fish Sat Aug 20 21:21:56 2016 +0000
@@ -1,5 +1,5 @@
function irclogs -d "Open the IRC logs dir in vim"
cd ~/.weechat/logs/
- vim .
+ nvim .
cd -
end
--- a/lispwords Mon Jul 18 13:04:41 2016 +0000
+++ b/lispwords Sat Aug 20 21:21:56 2016 +0000
@@ -14,6 +14,9 @@
; my own weird things
(1 make-array)
+(1 dis)
+(1 do-array)
+(1 recursively)
; fiveam
(1 test)
@@ -31,6 +34,7 @@
(1 while until)
(1 with-gensyms)
(1 once-only)
+(1 dohash)
; arrows
(1 -> ->> -<> -<>>)
@@ -47,3 +51,5 @@
; charms
(1 with-curses)
+
+
--- a/mutt/muttrc Mon Jul 18 13:04:41 2016 +0000
+++ b/mutt/muttrc Sat Aug 20 21:21:56 2016 +0000
@@ -11,7 +11,7 @@
# Editor {{{
# Use Vim to compose email, with a few default options.
-set editor = "/usr/local/bin/vim -c 'normal! }' -c 'redraw'"
+set editor = "/usr/local/bin/nvim -c 'normal! }' -c 'redraw'"
# }}}
# Contacts {{{
--- a/roswell/lispindent.ros Mon Jul 18 13:04:41 2016 +0000
+++ b/roswell/lispindent.ros Sat Aug 20 21:21:56 2016 +0000
@@ -32,7 +32,8 @@
(defvar *lisp-keywords* '())
(defvar *labels-keywords* '(labels flet macrolet labels* flet*))
-(defvar *lambda-list-keywords* '(defun defmethod defmacro define-compiler-macro defun*))
+(defvar *labels2-keywords* '(state-machine))
+(defvar *lambda-list-keywords* '(defun defmethod defmacro define-compiler-macro defun* defmacro-clause defmacro-driver))
(defvar *case-keywords* '(cond case))
@@ -138,10 +139,14 @@
(defun in-labels-p (stack)
(let ((target (cadr stack)))
- (and target
- (member (lparen-word target) *labels-keywords*
- :key #'symbol-name :test #'string-equal)
- (= (lparen-num-processed-subforms target) 0))))
+ (or (and target
+ (member (lparen-word target) *labels-keywords*
+ :key #'symbol-name :test #'string-equal)
+ (= (lparen-num-processed-subforms target) 0))
+ (and target
+ (member (lparen-word target) *labels2-keywords*
+ :key #'symbol-name :test #'string-equal)
+ (= (lparen-num-processed-subforms target) 1)))))
(defun in-lambda-list-p (stack)
(let ((target (car stack)))
--- a/vim/bundle/ooze/plugin/ooze.vim Mon Jul 18 13:04:41 2016 +0000
+++ b/vim/bundle/ooze/plugin/ooze.vim Sat Aug 20 21:21:56 2016 +0000
@@ -8,6 +8,7 @@
let g:ooze_connection = 0
endif
+let s:pending = ''
function! s:IsString(a) " {{{
return type(a:a) == 1
@@ -66,7 +67,17 @@
endfunction " }}}
function! s:HandleData(data) " {{{
- for msg in bencode#BdecodeAll(a:data)
+ let s:pending .= a:data
+
+ try
+ let messages = bencode#BdecodeAll(s:pending)
+ catch /bencode.*truncated/
+ return
+ endtry
+
+ let s:pending = ''
+
+ for msg in messages
call s:HandleMessage(msg)
endfor
endfunction " }}}
@@ -197,15 +208,16 @@
let @z = z
endfunction " }}}
function! OozeArglistFormHead() " {{{
+ let view = winsaveview()
+
if synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") == "Comment"
" bail if we're in a comment
" TODO: make this suck less
- return
+ else
+ execute "normal v\<plug>(sexp_inner_list)o\<plug>(sexp_inner_element)"
+ call OozeArglistSelection()
endif
- let view = winsaveview()
- execute "normal v\<plug>(sexp_inner_list)o\<plug>(sexp_inner_element)"
- call OozeArglistSelection()
call winrestview(view)
endfunction " }}}
@@ -254,27 +266,35 @@
endfunction " }}}
function! OozeMapKeys() " {{{
+ " [C]onnect and [K]ill
nnoremap <buffer> <localleader>C :call OozeConnect()<cr>
nnoremap <buffer> <localleader>K :call OozeDisconnect()<cr>
+ " [h]yperspec
nnoremap <buffer> <localleader>h :call OozeHyperspecForm()<cr>
nnoremap <buffer> <localleader>H :call OozeHyperspec(input("? "))<cr>
+ " [e]val ([f]orm)
nnoremap <buffer> <localleader>E :call OozeEval(input("? "))<cr>
vnoremap <buffer> <localleader>e :<c-u>call OozeEvalSelection()<cr>
nnoremap <buffer> <localleader>e mz:call OozeSelectTopLevelForm()<cr>:<c-u>call OozeEvalSelection()<cr>`z
nnoremap <buffer> <localleader>f mzvab:<c-u>call OozeEvalSelection()<cr>`z
+ " [M]anual and [D]ocument
nnoremap <buffer> <localleader>D :call OozeDocument(input("? "))<cr>
- " nnoremap <buffer> <localleader>d mzviw:<c-u>call OozeDocumentSelection()<cr>`z
inoremap <buffer> <silent> <c-d> <c-o>:<c-u>call OozeDocumentFormHead()<cr>
- inoremap <buffer> <silent> <space> <esc>:<c-u>call OozeArglistFormHead()<cr>a<c-v><space>
nnoremap <buffer> M mzviw:<c-u>call OozeDocumentSelection()<cr>`z
+ " [m]acroexpand
nnoremap <buffer> <localleader>M :call OozeMacroexpand(input("? "))<cr>
nnoremap <buffer> <localleader>m mzvab:<c-u>call OozeMacroexpandSelection()<cr>`z
+ " [r]eload
nnoremap <buffer> <localleader>r :call OozeLoadCurrent()<cr>
+
+ " magic arglist shit
+ inoremap <buffer> <silent> <space> <space><esc>:<c-u>call OozeArglistFormHead()<cr>a
+ " inoremap <buffer> <silent> <cr> <cr><c-o>:<c-u>call OozeArglistFormHead()<cr>
endfunction " }}}
augroup ooze_dev " {{{
--- a/vim/custom-dictionary.utf-8.add Mon Jul 18 13:04:41 2016 +0000
+++ b/vim/custom-dictionary.utf-8.add Sat Aug 20 21:21:56 2016 +0000
@@ -198,3 +198,5 @@
janky
CLOS
ncurses
+docstrings
+accessor
--- a/vim/ftplugin/lisp/lispfolding.vim Mon Jul 18 13:04:41 2016 +0000
+++ b/vim/ftplugin/lisp/lispfolding.vim Sat Aug 20 21:21:56 2016 +0000
@@ -161,6 +161,9 @@
elseif getline(a:lnum) =~ '^(def'
" fuck it just fold everything that looks kinda deffy
return ">1"
+ elseif getline(a:lnum) =~ '^(let '
+ " let over lambda
+ return ">1"
elseif getline(a:lnum) =~ '^$' && getline(a:lnum - 1) =~ '^$'
return "0"
elseif getline(a:lnum) =~ '^$'
--- a/vim/vimrc Mon Jul 18 13:04:41 2016 +0000
+++ b/vim/vimrc Sat Aug 20 21:21:56 2016 +0000
@@ -109,7 +109,7 @@
au FocusLost * :silent! wall
" Resize splits when the window is resized
-au VimResized * :wincmd =
+" au VimResized * :wincmd =
" Leader
let mapleader = ","
@@ -923,6 +923,9 @@
setlocal lispwords+=eswitch
setlocal lispwords+=with-gensyms
setlocal lispwords+=once-only
+
+ " more shit
+ setlocal lispwords+=define-test
endfunction "}}}
function! SendLispForm() "{{{
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vimperatorrc Sat Aug 20 21:21:56 2016 +0000
@@ -0,0 +1,33 @@
+" gotta go fast
+nnoremap j 6j
+nnoremap k 6k
+
+" remove gui cruft
+set gui=none,tabs
+
+" my eyes are bad
+highlight CmdLine font: normal 15px 'Menlo' !important; background: white !important; padding: 0px 10px 0px 0px;
+highlight CmdLine>* font: normal 15px 'Menlo' !important;
+highlight StatusLine font: normal 15px 'Menlo' !important; padding: 2px 10px 2px 0px;
+
+highlight CmdOutput font: normal 13px 'Menlo' !important;
+highlight CompItem font: normal 13px 'Menlo' !important;
+highlight CompTitle font: normal 13px 'Menlo' !important;
+
+" I never use marks, but always use quickmarks.
+nnoremap "'" go
+nnoremap '"' gn
+
+" Switch tabs with parens
+nnoremap ) :tn<CR>
+nnoremap ( :tp<CR>
+
+" YES YES YES REMOVE THE IDIOCY
+nnoremap <bs> <nop>
+
+" Clear search highlighting and normal highlighting.
+nnoremap ,<space> <esc>:noh<CR>
+
+
+" unfuck ublock
+style -name ublick * #nav-bar * { visibility: visible; }