--- a/fish/config.fish Wed May 11 20:50:53 2016 +0000
+++ b/fish/config.fish Sun May 29 10:19:33 2016 +0000
@@ -69,6 +69,7 @@
prepend_to_path "/bin"
prepend_to_path "/usr/bin"
prepend_to_path "/usr/local/bin"
+prepend_to_path "/Library/TeX/texbin/"
# prepend_to_path "/usr/local/share/python"
prepend_to_path "/usr/local/sbin"
prepend_to_path "/usr/local/share/npm/bin"
--- a/gitconfig Wed May 11 20:50:53 2016 +0000
+++ b/gitconfig Sun May 29 10:19:33 2016 +0000
@@ -37,6 +37,7 @@
d = "!sh -c 'git diff $* | vim -R -' -"
di = !git diff --cached | vim -R -
+ dl = !git diff | vim -R -c 'set ft=diff' -
co = checkout
id = rev-parse
--- a/lispwords Wed May 11 20:50:53 2016 +0000
+++ b/lispwords Sun May 29 10:19:33 2016 +0000
@@ -5,6 +5,8 @@
(2 with-accessors)
(0 :use :export :documentation)
(1 :shadowing-import-from :import-from)
+(1 symbol-macrolet)
+(1 print-unreadable-object)
; my own weird things
(1 make-array)
@@ -29,8 +31,11 @@
(1 -> ->> -<> -<>>)
; sketch
-(1 with-pen)
+(1 with-pen with-font)
(2 defsketch)
; sbcl
(1 with-profiling)
+
+; policy-cond
+(1 policy-if)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mutt/DigiCertHighAssuranceEVRootCA.crt Sun May 29 10:19:33 2016 +0000
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
--- a/mutt/muttrc Wed May 11 20:50:53 2016 +0000
+++ b/mutt/muttrc Sun May 29 10:19:33 2016 +0000
@@ -6,7 +6,6 @@
set certificate_file = ~/.mutt/certificates # where to store certs
set mailcap_path = ~/.mutt/mailcap # entries for filetypes
set tmpdir = ~/.mutt/temp # where to keep temp files
-set signature = ~/.mutt/sig # my signature file
# }}}
# Editor {{{
@@ -27,7 +26,7 @@
source ~/.vim/bundle/badwolf/contrib/badwolf.muttrc
-set folder = ~/.mail/steve-stevelosh.com # mailbox location
+set folder = ~/.mail # mail location
set wait_key = no # shut up, mutt
set mbox_type = Maildir # mailbox type
@@ -70,14 +69,18 @@
# }}}
# Sidebar Patch {{{
-# set sidebar_delim = ' │'
-# set sidebar_visible = yes
-# set sidebar_width = 26
-# color sidebar_new color221 color233
-# bind index,pager <down> sidebar-next
-# bind index,pager <up> sidebar-prev
-# bind index,pager <right> sidebar-open
-# set sidebar_format = "%B %> %S"
+set sidebar_divider_char = '│'
+set sidebar_visible = yes
+set sidebar_width = 25
+color sidebar_new color221 color233
+color sidebar_highlight brightcolor39 color233
+color sidebar_indicator brightcolor7 color233
+
+bind index,pager <down> sidebar-next
+bind index,pager <up> sidebar-prev
+bind index,pager <right> sidebar-open
+
+set sidebar_format = "%B %> %N "
# }}}
# Status Bar {{{
@@ -114,7 +117,6 @@
# }}}
# Compose View Options {{{
-set realname = "Steve Losh" # who am i?
set envelope_from # which from?
set sig_dashes # dashes before sig
set edit_headers # show headers when composing
@@ -144,35 +146,13 @@
hdr_order from: to: cc: date: subject: # and in this order
# }}}
-# steve@stevelosh.com {{{
-
-# Default inbox.
-set spoolfile = "+INBOX"
-
-# Alternate email addresses.
-alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org steven15@ru.is
+# Accounts {{{
-# Mailboxes to show in the sidebar.
-mailboxes +INBOX \
- +vim \
- +clojure \
- +python \
- +mercurial \
- +archive \
- +sent \
- +drafts \
- +temporary/search \
-
-# Other special folders.
-set mbox = "+steve-stevelosh.com/archive"
-set postponed = "+steve-stevelosh.com/drafts"
-
-# Sending email.
-set from = "steve@stevelosh.com"
-set sendmail = "/usr/local/bin/msmtp -a stevelosh"
set sendmail_wait = 0 # no please don't silently fail, email is important
unset record
+source ~/Dropbox/Settings/mail-accounts/accounts
+
# }}}
# Key Bindings {{{
@@ -203,8 +183,8 @@
# Quickly change mailboxes
macro index c "<change-folder>?<toggle-mailboxes>" "change folder"
-macro index \' "<change-folder>+INBOX<enter>" "go to INBOX"
-macro index \" "<change-folder>+archive<enter>" "go to archive"
+macro index \' "<change-folder>+sjl/INBOX<enter>" "go to INBOX"
+macro index \" "<change-folder>+sjl/archive<enter>" "go to archive"
# Search with notmuch
macro index S "<enter-command>unset wait_key<enter><shell-escape>mutt-notmuch-py -G ~/.mail/search<enter><change-folder-readonly>~/.mail/search<enter>" "search mail (using notmuch)"
@@ -228,11 +208,8 @@
macro pager s "<pipe-message>cat > ~/Desktop/" "save message as"
# Quickly change mailboxes
-macro pager \' "<exit><change-folder>+steve-stevelosh.com/INBOX<enter>" "go to INBOX"
-macro pager \" "<exit><change-folder>+steve-stevelosh.com/archive<enter>" "go to archive"
-
-# Translate from Icelandic
-macro pager T "<pipe-message>trans is:en -b -u firefox | less<enter>" "translate message from Icelandic"
+macro pager \' "<exit><change-folder>+sjl/INBOX<enter>" "go to INBOX"
+macro pager \" "<exit><change-folder>+sjl/archive<enter>" "go to archive"
# }}}
# Compose {{{
@@ -250,7 +227,6 @@
# "Open in Vim" {{{
macro index,pager V "|vim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' -<enter>" "open in vim"
-macro index,pager M "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' - >/dev/null<enter>" "open in macvim"
# }}}
--- a/mutt/notmuch-config Wed May 11 20:50:53 2016 +0000
+++ b/mutt/notmuch-config Sun May 29 10:19:33 2016 +0000
@@ -11,7 +11,7 @@
# configured here named ".notmuch".
#
[database]
-path=/Users/sjl/.mail/steve-stevelosh.com
+path=/Users/sjl/.mail/sjl
# User configuration
#
--- a/offlineimaprc Wed May 11 20:50:53 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-[general]
-ui = TTY.TTYUI
-accounts = SteveLosh
-pythonfile=~/.mutt/offlineimap.py
-fsync = False
-
-[Account SteveLosh]
-localrepository = SteveLosh-Local
-remoterepository = SteveLosh-Remote
-status_backend = sqlite
-postsynchook = notmuch new
-
-[Repository SteveLosh-Local]
-type = Maildir
-localfolders = ~/.mail/steve-stevelosh.com
-nametrans = lambda folder: {'drafts': '[Gmail]/Drafts',
- 'sent': '[Gmail]/Sent Mail',
- 'flagged': '[Gmail]/Starred',
- 'trash': '[Gmail]/Trash',
- 'archive': '[Gmail]/All Mail',
- }.get(folder, folder)
-
-[Repository SteveLosh-Remote]
-maxconnections = 1
-type = Gmail
-remoteuser = steve@stevelosh.com
-remotepasseval = get_keychain_pass(account="steve@stevelosh.com", server="imap.gmail.com")
-realdelete = no
-nametrans = lambda folder: {'[Gmail]/Drafts': 'drafts',
- '[Gmail]/Sent Mail': 'sent',
- '[Gmail]/Starred': 'flagged',
- '[Gmail]/Trash': 'trash',
- '[Gmail]/All Mail': 'archive',
- }.get(folder, folder)
-folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
- 'Nagios',
- 'Clojure',
- 'Mercurial',
- 'Python',
- 'Django',
- 'Flask',
- '[Gmail]/Important',
- '[Gmail]/Spam',
- ]
-
-# [Account Simple]
-# localrepository = Simple-Local
-# remoterepository = Simple-Remote
-# status_backend = sqlite
-# postsynchook = notmuch new
-#
-# [Repository Simple-Local]
-# type = Maildir
-# localfolders = ~/.mail/simple
-# nametrans = lambda folder: {'drafts': '[Gmail]/Drafts',
-# 'sent': '[Gmail]/Sent Mail',
-# 'flagged': '[Gmail]/Starred',
-# 'trash': '[Gmail]/Trash',
-# 'archive': '[Gmail]/All Mail',
-# }.get(folder, folder)
-#
-# [Repository Simple-Remote]
-# maxconnections = 1
-# type = Gmail
-# remoteuser = sjl@simple.com
-# remotepasseval = get_keychain_pass(account="sjl@simple.com", server="imap.gmail.com")
-# realdelete = no
-# nametrans = lambda folder: {'[Gmail]/Drafts': 'drafts',
-# '[Gmail]/Sent Mail': 'sent',
-# '[Gmail]/Starred': 'flagged',
-# '[Gmail]/Trash': 'trash',
-# '[Gmail]/All Mail': 'archive',
-# }.get(folder, folder)
-# folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
-# '[Gmail]/Important',
-# '[Gmail]/Spam',
-# ]
--- a/vim/custom-dictionary.utf-8.add Wed May 11 20:50:53 2016 +0000
+++ b/vim/custom-dictionary.utf-8.add Sun May 29 10:19:33 2016 +0000
@@ -177,3 +177,4 @@
heightmaps
greyscale
heightmap
+pathfinding
--- a/vim/vimrc Wed May 11 20:50:53 2016 +0000
+++ b/vim/vimrc Sun May 29 10:19:33 2016 +0000
@@ -993,8 +993,6 @@
normal! "zyiw
call NeoReplSendRaw("(describe '" . @z . ")\n")
-
- let @z = old_z
endfunction "}}}
function! DescribeLispPrompt() "{{{
call NeoReplSendRaw("(describe '" . input("? ") . ")\n")
@@ -1012,6 +1010,37 @@
function! MacroexpandLispPrompt() "{{{
call NeoReplSendRaw("(macroexpand-1 '" . input("? ") . ")\n")
endfunction "}}}
+function! DisassembleLispSymbol() "{{{
+ let old_z = @z
+
+ normal! "zyiw
+ call NeoReplSendRaw("(disassemble '" . @z . ")\n")
+
+ let @z = old_z
+endfunction "}}}
+function! DuplicateLispForm() " {{{
+ let old_z = @z
+
+ " save our position
+ normal! mz
+
+ " yank the form into the z register and paste it out
+ execute "normal v\<Plug>(sexp_outer_list)"
+ normal! "zy
+ normal! "zP
+
+ " move right and insert the line break
+ execute "normal! a\<cr>\<esc>"
+
+ " jump back to our previous position and indent
+ normal! `z
+ call IndentToplevelLispForm()
+
+ " move down so we're on the duplicate line, but in the right place
+ normal! j
+
+ let @z = old_z
+endfunction " }}}
" }}}
augroup ft_commonlisp
@@ -1043,6 +1072,9 @@
au FileType lisp noremap <buffer> )s :<c-u>call PareditSplit()<cr>
" ))
+ " Handy stuff
+ au FileType lisp nnoremap <buffer> [] :call DuplicateLispForm()<cr>
+
" s/it/happening/
"
" Map the Ooze keys, then add a few extra on top to work with the REPL.
@@ -1056,6 +1088,7 @@
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> gi :call IndentToplevelLispForm()<cr>
+ au FileType lisp nnoremap <buffer> <silent> <localleader>d :call DisassembleLispSymbol()<cr>
" Navigate trees of sexps with arrows
au FileType lisp call s:vim_sexp_mappings()