# HG changeset patch # User Steve Losh # Date 1531751827 0 # Node ID b7c569c5f66b38ebe7ebd085e9d7e62bdec28419 # Parent 6d2fdb8941e988634a2710257e665fb4798170a9# Parent 1f7fd4683ec5bbd1025b54559ca129b2b1736044 Merge. diff -r 6d2fdb8941e9 -r b7c569c5f66b bin/brows --- a/bin/brows Mon Jul 16 14:37:00 2018 +0000 +++ b/bin/brows Mon Jul 16 14:37:07 2018 +0000 @@ -1,1 +1,1 @@ -/Users/sjl/src/brows/bin/brows \ No newline at end of file +/home/sjl/src/brows/bin/brows \ No newline at end of file diff -r 6d2fdb8941e9 -r b7c569c5f66b bin/ecl --- a/bin/ecl Mon Jul 16 14:37:00 2018 +0000 +++ b/bin/ecl Mon Jul 16 14:37:07 2018 +0000 @@ -1,3 +1,3 @@ #!/usr/bin/env bash -rlwrap-lisp /usr/local/bin/ecl "$@" +rlwrap-lisp /usr/bin/ecl "$@" diff -r 6d2fdb8941e9 -r b7c569c5f66b bin/heading --- a/bin/heading Mon Jul 16 14:37:00 2018 +0000 +++ b/bin/heading Mon Jul 16 14:37:07 2018 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/env bash echo -figlet -kf $1 $2 | sed -Ee 's/ +$$//' | tr -s '\n' | lolcat --freq=0.25 +toilet -k -F metal:crop -f "$1" "$2" echo diff -r 6d2fdb8941e9 -r b7c569c5f66b mutt/mailcap --- a/mutt/mailcap Mon Jul 16 14:37:00 2018 +0000 +++ b/mutt/mailcap Mon Jul 16 14:37:07 2018 +0000 @@ -1,35 +1,17 @@ # ~/.mutt/mailcap -# -# this uses the view_attachment script found in ~/.mutt/view_attachment.sh -# -# this is meant for an OS X system -# MS Excel -# this will use the default xls spreadsheet handler from open application/x-msexcel; ~/.mutt/view_attachment.sh %s application/ms-exc; ~/.mutt/view_attachment.sh %s application/excel; ~/.mutt/view_attachment.sh %s application/msexcel; ~/.mutt/view_attachment.sh %s application/vnd.ms-exc; ~/.mutt/view_attachment.sh %s application/vnd.ms-excel; ~/.mutt/view_attachment.sh %s - -# MS Word -# use textedit to open .doc files as it's more light-weight -application/msword; ~/.mutt/view_attachment.sh %s "-" '/Applications/TextEdit.app' - -# Images +application/msword; ~/.mutt/view_attachment.sh %s image/jpg; ~/.mutt/view_attachment.sh %s jpg image/jpeg; ~/.mutt/view_attachment.sh %s jpg image/pjpeg; ~/.mutt/view_attachment.sh %s jpg image/png; ~/.mutt/view_attachment.sh %s png image/gif; ~/.mutt/view_attachment.sh %s gif - -# PDF -# application/pdf; ~/.mutt/view_attachment.sh %s pdf - -# HTML text/html; ~/.mutt/view_attachment.sh %s html - -# Unidentified. application/octet-stream; ~/.mutt/view_attachment.sh %s "-" diff -r 6d2fdb8941e9 -r b7c569c5f66b mutt/muttrc --- a/mutt/muttrc Mon Jul 16 14:37:00 2018 +0000 +++ b/mutt/muttrc Mon Jul 16 14:37:07 2018 +0000 @@ -154,7 +154,7 @@ set sendmail_wait = 0 # no please don't silently fail, email is important unset record -# source ~/Dropbox/Settings/mail-accounts/accounts +source ~/Dropbox/Settings/mail-accounts/accounts # }}} # Key Bindings {{{ diff -r 6d2fdb8941e9 -r b7c569c5f66b mutt/notmuch-config --- a/mutt/notmuch-config Mon Jul 16 14:37:00 2018 +0000 +++ b/mutt/notmuch-config Mon Jul 16 14:37:07 2018 +0000 @@ -11,7 +11,7 @@ # configured here named ".notmuch". # [database] -path=/Users/sjl/.mail/sjl +path=/home/sjl/.mail/sjl # User configuration # @@ -31,7 +31,7 @@ [user] name=Steve Losh primary_email=steve@stevelosh.com -other_email=still.life@gmail.com;stilllife@gmail.com;sjl@pculture.org;steve@pculture.org;steve@ladyluckblues.com;sjl@simple.com;slosh@simple.com;slj@simple.com +other_email=still.life@gmail.com;stilllife@gmail.com;sjl@pculture.org;steve@pculture.org;steve@ladyluckblues.com;sjl@simple.com;slosh@simple.com;slj@simple.com;steven15@ru.is # Configuration for "notmuch new" # @@ -48,7 +48,7 @@ # [new] tags=unread;inbox; -ignore= +ignore=spam # Search configuration # diff -r 6d2fdb8941e9 -r b7c569c5f66b roswell/clhs.lisp --- a/roswell/clhs.lisp Mon Jul 16 14:37:00 2018 +0000 +++ b/roswell/clhs.lisp Mon Jul 16 14:37:07 2018 +0000 @@ -52,8 +52,7 @@ (defun clhs-base-url () - (or (uiop:getenv "CLHS_BASE_URL") - "http://www.lispworks.com/documentation/HyperSpec/")) + "file:///home/sjl/Dropbox/HyperSpec/HyperSpec/") (defun clhs-cache-directory () (let ((cache-dir @@ -64,13 +63,7 @@ (defun clhs-cache-file () (merge-pathnames #P"symbols-map.sexp" (clhs-cache-directory))) -(defun open-command () - (or (uiop:getenv "CLHS_OPEN_COMMAND") - #+darwin "open" - #+linux "xdg-open" - #+(or windows win32) "explorer" - #-(or darwin linux windows win32) - (error "CLHS_OPEN_COMMAND is not set."))) +(defun open-command () "w3m") (defun terminate (code &optional message &rest args) @@ -145,7 +138,10 @@ (if path (let ((url (clhs-url path))) (format t "~&Opening ~S~%" url) - (uiop:run-program `(,(open-command) ,url) :ignore-error-status t :output :interactive)) + (uiop:run-program `(,(open-command) ,url) + :ignore-error-status t + :input :interactive + :output :interactive)) (terminate -1 "Symbol not found: ~A" target-symbol)))) (defun build () diff -r 6d2fdb8941e9 -r b7c569c5f66b stumpwmrc --- a/stumpwmrc Mon Jul 16 14:37:00 2018 +0000 +++ b/stumpwmrc Mon Jul 16 14:37:07 2018 +0000 @@ -12,6 +12,7 @@ *message-window-gravity* :center *input-window-gravity* :center *debug-level* 0 + *resize-increment* 50 *shell-program* "/bin/bash") diff -r 6d2fdb8941e9 -r b7c569c5f66b vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Mon Jul 16 14:37:00 2018 +0000 +++ b/vim/custom-dictionary.utf-8.add Mon Jul 16 14:37:07 2018 +0000 @@ -221,3 +221,4 @@ Macbook Topre Realforce +Homebrew diff -r 6d2fdb8941e9 -r b7c569c5f66b vim/vimrc --- a/vim/vimrc Mon Jul 16 14:37:00 2018 +0000 +++ b/vim/vimrc Mon Jul 16 14:37:07 2018 +0000 @@ -1608,6 +1608,15 @@ augroup END " }}} +" Prolog {{{ + +augroup ft_prolog + au! + + au BufNewFile,BufRead *.pl set filetype=prolog +augroup END + +" }}} " Python {{{ function! SelectTopLevelPythonHunk() "{{{ @@ -2304,6 +2313,57 @@ endfunction " }}} +" Pass {{{ + +" https://github.com/milki/password-store/blob/master/contrib/vim/noplaintext.vim +" +" Prevent various Vim features from keeping the contents of pass(1) password +" files (or any other purely temporary files) in plaintext on the system. +" +" Either append this to the end of your .vimrc, or install it as a plugin with +" a plugin manager like Tim Pope's Pathogen. +" +" Author: Tom Ryder +" + +" Don't backup files in temp directories or shm +if exists('&backupskip') + set backupskip+=/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* +endif + +" Don't keep swap files in temp directories or shm +if has('autocmd') + augroup swapskip + autocmd! + silent! autocmd BufNewFile,BufReadPre + \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* + \ setlocal noswapfile + augroup END +endif + +" Don't keep undo files in temp directories or shm +if has('persistent_undo') && has('autocmd') + augroup undoskip + autocmd! + silent! autocmd BufWritePre + \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* + \ setlocal noundofile + augroup END +endif + +" Don't keep viminfo for files in temp directories or shm +if has('viminfo') + if has('autocmd') + augroup viminfoskip + autocmd! + silent! autocmd BufNewFile,BufReadPre + \ /tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*,*/shm/* + \ setlocal viminfo= + augroup END + endif +endif + +" }}} " Python-Mode {{{ let g:pymode_doc = 1