--- a/.hgsubstate Sat Jan 23 18:22:17 2016 +0000
+++ b/.hgsubstate Tue Feb 09 13:44:13 2016 +0000
@@ -16,7 +16,7 @@
ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch
1c75b56ceb96a6e7fb6708ae96ab63b3023bab2f vim/bundle/fireplace
935a2cccd3065b1322fb2235285d42728600afdf vim/bundle/fugitive
-7959df37f09627dfe1ac640756dfed49dc1c876c vim/bundle/gdl
+4c3cf32561ea9ee11c6f2eb3cdd28cad62906f37 vim/bundle/gdl
6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
6e9f52a160e3d15060848a8f453bd1b5bfa70db2 vim/bundle/gnupg
0d57b080f9fae8573c688b6679b31eb1666edc4c vim/bundle/gnuplot
--- a/fish/functions/t.fish Sat Jan 23 18:22:17 2016 +0000
+++ b/fish/functions/t.fish Tue Feb 09 13:44:13 2016 +0000
@@ -1,4 +1,8 @@
function t
- ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt $argv
+ if math (count $argv) == 0 >/dev/null
+ ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt | sort -t - -k 2.1
+ else
+ ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt $argv
+ end
end
--- a/gitconfig Sat Jan 23 18:22:17 2016 +0000
+++ b/gitconfig Tue Feb 09 13:44:13 2016 +0000
@@ -24,12 +24,13 @@
pull = pull --ff-only
up = merge --ff-only
+ update = merge --ff-only
join = merge --no-ff
discard-merge = reset --hard HEAD
- ack = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset' --full-history -S
+ ack = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset' --full-history -S
ci = commit
cm = commit -m
--- a/vim/after/syntax/lisp.vim Sat Jan 23 18:22:17 2016 +0000
+++ b/vim/after/syntax/lisp.vim Tue Feb 09 13:44:13 2016 +0000
@@ -2,7 +2,12 @@
" this works i don't care
syn match lispKey "\k\@<!:\k\+"
syn match lispDecl "define-\k\+"
+
syn keyword lispDecl defmethod defvar defparameter
+" FiveAM shit
+syn keyword lispDecl test
+syn keyword lispFunc def-suite in-suite
+
syn match lispString !#\\[\(\)]!
--- a/vim/vimrc Sat Jan 23 18:22:17 2016 +0000
+++ b/vim/vimrc Tue Feb 09 13:44:13 2016 +0000
@@ -358,6 +358,12 @@
nnoremap vaa ggvGg_
nnoremap Vaa ggVG
+" Fix from spellcheck
+" I can never remember if it's zg or z=, and the wrong one adds the word to
+" the DB (lol), so fuck it, just add an easier mapping.
+nnoremap zz z=
+nnoremap z= :echo "use zz you idiot"<cr>
+
" "Uppercase word" mapping.
"
" This mapping allows you to press <c-u> in insert mode to convert the current
@@ -879,7 +885,7 @@
setlocal lispwords+=when-let
setlocal lispwords+=optima:match
setlocal lispwords+=match
- setlocal lispwords+=match
+ setlocal lispwords+=test
setlocal lispwords+=.let*
endfunction "}}}
function! SendLispForm() "{{{
@@ -1286,6 +1292,7 @@
au FileType java setlocal foldmethod=marker
au FileType java setlocal foldmarker={,}
+ au FileType java inoremap <c-n> <c-x><c-n>
augroup END
" }}}
@@ -2177,6 +2184,7 @@
\ "textwidth", "tw",
\ "foldmethod", "fdm",
\ "foldnextmax", "fdn",
+ \ "lispwords", "lw",
\ ]
" }}}