3ab791da6777

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Fri, 24 Nov 2017 15:05:53 -0500
parents 1cd90a0458e4 (diff) 1ecae6c99d54 (current diff)
children 28205343c464 ac6c2e7934da
branches/tags (none)
files

Changes

--- a/.hgsubstate	Mon Oct 16 10:02:20 2017 -0700
+++ b/.hgsubstate	Fri Nov 24 15:05:53 2017 -0500
@@ -1,4 +1,4 @@
-5334581e231a5167d03689ff47b3a6fdf082011c mercurial/hg-prompt
+4dddc56c4c4b420c91d4a9b20e8f9589953b3fde mercurial/hg-prompt
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates
 b6a8b49e2173ba5a1b34d00e68e0ed8addac3ebd vim/bundle/abolish
 a16a9b63eb85cc0960a7f25c54647ac1f99f3360 vim/bundle/ack
@@ -40,5 +40,5 @@
 f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
 5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
 bf3fd7f67e730f93765bd3c1cfcdb18fd4043521 vim/bundle/vitality
-faff23c03a5a1f28d6ef5963e6a9caa46af7074a vim/bundle/vlime
+065b95f3ac7a455314c2bdefeb2b792f290034df vim/bundle/vlime
 6876fe38b33732cb124d415ffc4156f16da5e118 vim/bundle/windowswap
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/abcl	Fri Nov 24 15:05:53 2017 -0500
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+rlwrap-lisp /usr/local/bin/abcl "$@"
--- a/bin/abcl-nrepl	Mon Oct 16 10:02:20 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-abcl --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
--- a/bin/arduino-serial	Mon Oct 16 10:02:20 2017 -0700
+++ b/bin/arduino-serial	Fri Nov 24 15:05:53 2017 -0500
@@ -1,3 +1,10 @@
 #!/usr/bin/env bash
 
-rlwrap -I -m @ -M .lisp -a ___ -O '^[a-zA-Z0-9]+>' -p BLUE -q '"' python2 -m serial.tools.miniterm /dev/cu.usbmodem* 9600 --exit-char 38 --eol LF
+rlwrap --pass-sigint-as-sigterm \
+       -m@ \
+       --multi-line-ext .lisp \
+       -a___ \
+       --only-cook '^[a-zA-Z0-9]+>' \
+       -pBLUE \
+       --quote-characters '"' \
+       python2 -m serial.tools.miniterm /dev/cu.*usb* 9600 --exit-char 38 --eol LF
--- a/bin/ccl	Mon Oct 16 10:02:20 2017 -0700
+++ b/bin/ccl	Fri Nov 24 15:05:53 2017 -0500
@@ -1,1 +1,6 @@
-ccl-rlwrap
\ No newline at end of file
+#!/usr/bin/env bash
+
+set -e
+rlwrap-lisp /usr/local/bin/ccl64 "$@"
+# /usr/local/bin/ccl "$@"
+
--- a/bin/ccl-nrepl	Mon Oct 16 10:02:20 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-ccl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
--- a/bin/ccl-rlwrap	Mon Oct 16 10:02:20 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-rlwrap /usr/local/bin/ccl64 "$@"
-# /usr/local/bin/ccl "$@"
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/ccl-vlime	Fri Nov 24 15:05:53 2017 -0500
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+set -e
+ccl --eval "(load \"~/lib/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp\")" "$@"
--- a/bin/code-to-pdf	Mon Oct 16 10:02:20 2017 -0700
+++ b/bin/code-to-pdf	Fri Nov 24 15:05:53 2017 -0500
@@ -8,7 +8,6 @@
     --header '%H - $N | | page $% of $= in file $v' \
     --font "Menlo-Regular@8.5" \
     --header-font "Menlo-Bold@10" \
-    --margins=60:60:18:60 \
     --fancy-header=sjl \
     --title "$TITLE" \
     --baselineskip 3 \
@@ -16,7 +15,10 @@
     --highlight \
     --color \
     --mark-wrapped-lines=arrow \
+    --landscape \
+    --margins=20:40:30:30 \
     -p - \
     --word-wrap $* \
     | pstopdf -i -o code.pdf
 
+    # --margins=60:60:18:60 \
--- a/bin/ecl	Mon Oct 16 10:02:20 2017 -0700
+++ b/bin/ecl	Fri Nov 24 15:05:53 2017 -0500
@@ -1,1 +1,3 @@
-ecl-rlwrap
\ No newline at end of file
+#!/usr/bin/env bash
+
+rlwrap-lisp /usr/local/bin/ecl "$@"
--- a/bin/ecl-nrepl	Mon Oct 16 10:02:20 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-ecl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
--- a/bin/ecl-rlwrap	Mon Oct 16 10:02:20 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-rlwrap ros -L ecl run -l ~/.eclrc "$@"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/heading	Fri Nov 24 15:05:53 2017 -0500
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+echo
+figlet -kf $1 $2 | sed -Ee 's/ +$$//' | tr -s '\n' | lolcat --freq=0.25
+echo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/rlwrap-lisp	Fri Nov 24 15:05:53 2017 -0500
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+rlwrap -m@ \
+       --multi-line-ext .lisp \
+       -a___ \
+       --only-cook '^\[[a-zA-Z ]+\] [-a-zA-Z0-9._]+>' \
+       -pBLUE \
+       --quote-characters '"' \
+       --histsize 1000 \
+       --history-filename "$HOME/.rlwrap-lisp-history" \
+       "$@"
--- a/bin/sbcl	Mon Oct 16 10:02:20 2017 -0700
+++ b/bin/sbcl	Fri Nov 24 15:05:53 2017 -0500
@@ -1,1 +1,4 @@
-sbcl-rlwrap
\ No newline at end of file
+#!/usr/bin/env bash
+
+set -e
+rlwrap-lisp /usr/local/bin/sbcl --noinform "$@"
--- a/bin/sbcl-nrepl	Mon Oct 16 10:02:20 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-sbcl-rlwrap --eval "(ql:quickload 'nrepl)" --eval "(nrepl:start-server)" "$@"
--- a/bin/sbcl-rlwrap	Mon Oct 16 10:02:20 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-rlwrap --histsize 1000 --history-filename "$HOME/.rlwrap-lisp-history" -- /usr/local/bin/sbcl --noinform --dynamic-space-size 4000 "$@"
--- a/bin/sbcl-vlime	Mon Oct 16 10:02:20 2017 -0700
+++ b/bin/sbcl-vlime	Fri Nov 24 15:05:53 2017 -0500
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 set -e
-sbcl-rlwrap --eval "(load \"~/lib/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp\")" "$@"
+sbcl --eval "(load \"~/lib/dotfiles/vim/bundle/vlime/lisp/start-vlime.lisp\")" "$@"
--- a/eclrc	Mon Oct 16 10:02:20 2017 -0700
+++ b/eclrc	Fri Nov 24 15:05:53 2017 -0500
@@ -1,4 +1,4 @@
-(setf compiler:*user-cc-flags* "-Wno-shift-negative-value")
+(setf compiler::*user-cc-flags* "-Wno-shift-negative-value")
 
 (defvar *last-package* nil)
 (defvar *cached-prompt* nil)
@@ -14,3 +14,10 @@
   (princ *cached-prompt*))
 
 (setf system:*tpl-prompt-hook* #'sjl-prompt)
+
+
+#-quicklisp
+(let ((quicklisp-init (merge-pathnames ".quicklisp/setup.lisp"
+                                    (user-homedir-pathname))))
+ (when (probe-file quicklisp-init)
+    (load quicklisp-init)))
--- a/fish/functions/ep.fish	Mon Oct 16 10:02:20 2017 -0700
+++ b/fish/functions/ep.fish	Fri Nov 24 15:05:53 2017 -0500
@@ -1,3 +1,7 @@
 function ep -d "Edit .plan"
-    nvim ~/.plan/README.markdown; and hg -R ~/.plan ci -m 'Update'
+    hg -R ~/.plan pull -u
+    nvim ~/.plan/README.markdown
+    hg -R ~/.plan ci -m 'Update'
+    hg -R ~/.plan push
+    hg -R ~/.plan push git
 end
--- a/hgignore	Mon Oct 16 10:02:20 2017 -0700
+++ b/hgignore	Fri Nov 24 15:05:53 2017 -0500
@@ -5,3 +5,4 @@
 tags
 tags.bak
 *.fasl
+*.dx64fsl
--- a/inputrc	Mon Oct 16 10:02:20 2017 -0700
+++ b/inputrc	Fri Nov 24 15:05:53 2017 -0500
@@ -5,4 +5,6 @@
 set output-meta on 
 set convert-meta off
 
-"\C-i": rlwrap-call-editor
+"\C-o": rlwrap-call-editor
+
+
--- a/vim/vimrc	Mon Oct 16 10:02:20 2017 -0700
+++ b/vim/vimrc	Fri Nov 24 15:05:53 2017 -0500
@@ -165,6 +165,7 @@
 set wildignore+=*.orig                           " Merge resolution files
 
 set wildignore+=*.fasl                           " Lisp FASLs
+set wildignore+=*.dx64fsl                        " CCL
 
 " Clojure/Leiningen
 set wildignore+=classes
@@ -540,7 +541,6 @@
 nnoremap <leader>el :vsplit ~/.lispwords<cr>
 nnoremap <leader>em :vsplit ~/.mutt/muttrc<cr>
 nnoremap <leader>ep :vsplit ~/.plan/README.markdown<cr>
-nnoremap <leader>ep :!vim ~/.plan/README.markdown && hg -R ~/.plan ci -m 'Update'<cr>
 nnoremap <leader>eq :vsplit ~/Dropbox/quotes.txt<cr>Gzz
 nnoremap <leader>et :vsplit ~/.tmux.conf<cr>
 nnoremap <leader>ev :vsplit ~/.vimrc<cr>
@@ -982,11 +982,9 @@
 
 function! OpenLispReplSBCL() "{{{
     NeoRepl sbcl-vlime
-    call InitializeLispRepl()
 endfunction "}}}
 function! OpenLispReplCCL() "{{{
-    NeoRepl ccl-nrepl
-    call InitializeLispRepl()
+    NeoRepl ccl-vlime
 endfunction "}}}
 function! OpenLispReplECL() "{{{
     NeoRepl ecl-nrepl
@@ -1633,6 +1631,20 @@
 augroup END
 
 " }}}
+" .plan {{{
+
+function! PlanLinkPaste()
+    execute "normal! gg}}O[]: \<esc>\"*p0"
+    normal! a
+endfunction
+
+augroup ft_plan
+    au!
+
+    au BufNewFile,BufRead ~/.plan/README.markdown nnoremap <buffer> <localleader>l :call PlanLinkPaste()<cr>
+augroup END
+
+" }}}
 " Postgresql {{{
 
 augroup ft_postgres
@@ -2259,6 +2271,7 @@
                     \ '^tags$',
                     \ '^.*\.meta$',
                     \ '^.*\.fasl$',
+                    \ '^.*\.dx64fsl$',
                     \ '.*\.bcf$', '.*\.blg$', '.*\.fdb_latexmk$', '.*\.bbl$', '.*\.aux$', '.*\.run.xml$', '.*\.fls$',
                     \ '.*\.midi$']
 
--- a/weechat/weechat.conf	Mon Oct 16 10:02:20 2017 -0700
+++ b/weechat/weechat.conf	Fri Nov 24 15:05:53 2017 -0500
@@ -236,7 +236,7 @@
 nicklist.conditions = "nicklist"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = off
+nicklist.hidden = on
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200