# HG changeset patch # User Steve Losh # Date 1636657969 18000 # Node ID c05932aa401fb4a3682767152a6d8edbd89a6c2e # Parent 2d5474ce49c7e5d9429d5a557902b612bf64cac8 More diff -r 2d5474ce49c7 -r c05932aa401f .hgsub --- a/.hgsub Tue Sep 14 11:37:23 2021 -0400 +++ b/.hgsub Thu Nov 11 14:12:49 2021 -0500 @@ -8,8 +8,8 @@ vim/bundle/commentary = [git]https://github.com/tpope/vim-commentary vim/bundle/ctrlp = [git]https://github.com/ctrlpvim/ctrlp.vim vim/bundle/delimitmate = [git]https://github.com/Raimondi/delimitMate +vim/bundle/firenvim = [git]https://github.com/glacambre/firenvim vim/bundle/fugitive = [git]https://github.com/tpope/vim-fugitive -vim/bundle/firenvim = [git]https://github.com/glacambre/firenvim vim/bundle/gdl = [hg]ssh://hg.stevelosh.com/repos/gdl.vim/ vim/bundle/glsl = [git]https://github.com/tikhomirov/vim-glsl vim/bundle/gnupg = [git]https://github.com/jamessan/vim-gnupg @@ -21,6 +21,7 @@ vim/bundle/jsx = [git]https://github.com/mxw/vim-jsx vim/bundle/markdown = [git]https://github.com/sjl/vim-markdown vim/bundle/miniyank = [git]https://github.com/bfredl/nvim-miniyank +vim/bundle/neoformat = [git]https://github.com/sbdchd/neoformat vim/bundle/nerdtree = [git]https://github.com/scrooloose/nerdtree vim/bundle/paredit = [git]https://github.com/kovisoft/paredit vim/bundle/pgsql = [git]https://github.com/exu/pgsql.vim @@ -32,6 +33,7 @@ vim/bundle/sexp = [git]https://github.com/guns/vim-sexp vim/bundle/shaderhighlight = [git]https://github.com/vim-scripts/ShaderHighLight vim/bundle/shellcheck = [git]https://github.com/itspriddle/vim-shellcheck +vim/bundle/simpylfold = [git]https://github.com/tmhedberg/SimpylFold vim/bundle/sparkup = [git]https://github.com/rstacruz/sparkup vim/bundle/splice = [hg]ssh://hg.stevelosh.com/repos/splice.vim vim/bundle/strftimedammit = [hg]ssh://hg.stevelosh.com/repos/strftimedammit.vim/ diff -r 2d5474ce49c7 -r c05932aa401f .hgsubstate --- a/.hgsubstate Tue Sep 14 11:37:23 2021 -0400 +++ b/.hgsubstate Thu Nov 11 14:12:49 2021 -0500 @@ -8,7 +8,7 @@ 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate -b18ee299c49f63f9c25dc8573a282179b06e4028 vim/bundle/firenvim +f62386a9edd8b24fe1155d998be0fa56e8d8ff85 vim/bundle/firenvim 755554bb3c44944f70f4b2048acf0c69261782ac vim/bundle/fugitive 127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl 6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl @@ -21,6 +21,7 @@ ffc0bfd9da15d0fce02d117b843f718160f7ad27 vim/bundle/jsx e2d7fcd682a461a3951e8b5067cc8a0083e75e35 vim/bundle/markdown 1362fdc7c32855794659cafe6e65d3239843d9df vim/bundle/miniyank +964c66fa22500ae7375114342d212d7fe15da341 vim/bundle/neoformat d6032c876c6d6932ab7f07e262a16c9a85a31d5b vim/bundle/nerdtree c76e0987ec45c84103b408691ec0506e7b99cb30 vim/bundle/paredit 1a436f7d875b4ec630da081b041c73264235c7e7 vim/bundle/pgsql @@ -32,6 +33,7 @@ b4398689f7483b01684044ab6b55bf369744c9b3 vim/bundle/sexp e02c3e218c51c1e2ea1821a3fe412d4e09ca1502 vim/bundle/shaderhighlight 4346419ac57ef341a15aa39c827c0848f17c6faf vim/bundle/shellcheck +0459df8a0bbfc8ef1bfd88db889e881626f65914 vim/bundle/simpylfold d400a570bf64b0c216aa7c8e1795820b911a7404 vim/bundle/sparkup 062b18eebd153c13e6f36577707acb17893cd959 vim/bundle/splice 26fbdd7d1f1aa5600d2ebf39bbdd292c38aac16e vim/bundle/strftimedammit diff -r 2d5474ce49c7 -r c05932aa401f bin/disks --- a/bin/disks Tue Sep 14 11:37:23 2021 -0400 +++ b/bin/disks Thu Nov 11 14:12:49 2021 -0500 @@ -8,9 +8,14 @@ ' echo echo -echo OUT=$(df -h) echo "$OUT" | head -1 echo "$OUT" | head -1 | sed 's/./-/g' echo "$OUT" | tail +2 | grep -Pv '^/dev/loop' | grep -Pv tmpfs | sort -k6 + +echo +OUT=$(df -i) +echo "$OUT" | head -1 +echo "$OUT" | head -1 | sed 's/./-/g' +echo "$OUT" | tail +2 | grep -Pv '^/dev/loop' | grep -Pv tmpfs | sort -k6 diff -r 2d5474ce49c7 -r c05932aa401f bin/myctags --- a/bin/myctags Tue Sep 14 11:37:23 2021 -0400 +++ b/bin/myctags Thu Nov 11 14:12:49 2021 -0500 @@ -2,14 +2,16 @@ set -e -/usr/local/bin/ctags -R . && sed -i .bak -E -e '/^[^ ]+ [^ ]+.py .+v$/d' tags +CTAGS=$(command -v ctags) +# $CTAGS -R . && sed -i.bak -E -e '/^[^ ]+ [^ ]+.py .+v$/d' tags -mv tags tags1 -touch tags2 +$CTAGS -R --sort=yes --exclude='bazel-*' . +# mv tags tags1 +# touch tags2 -echo '!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/' > tags -echo '!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/' >> tags +# echo '!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/' >> tags2 +# echo '!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/' >> tags2 -cat tags1 tags2 | grep -Ev '^!' | grep -v 'anonymous_function' | sort >> tags +# cat tags1 tags2 | grep -Ev '^!' | grep -v 'anonymous_function' | sort >> tags -rm tags1 tags2 +# rm tags1 tags2 diff -r 2d5474ce49c7 -r c05932aa401f ffignore --- a/ffignore Tue Sep 14 11:37:23 2021 -0400 +++ b/ffignore Thu Nov 11 14:12:49 2021 -0500 @@ -4,6 +4,7 @@ banner.txt UnityTempFile .m2 +.mail node_modules fake-gopath slug @@ -17,3 +18,4 @@ \.dx64fsl$ \.lx64fsl$ \.pyc$ +bazel-.* diff -r 2d5474ce49c7 -r c05932aa401f fish/config.fish --- a/fish/config.fish Tue Sep 14 11:37:23 2021 -0400 +++ b/fish/config.fish Thu Nov 11 14:12:49 2021 -0500 @@ -67,6 +67,7 @@ function please_fish_just_bind_the_keys bind \cn accept-autosuggestion bind \cw backward-kill-word + fzf_key_bindings end function fish_user_keybindings please_fish_just_bind_the_keys @@ -125,6 +126,9 @@ set -g -x LESS_TERMCAP_ue (printf '\e[0m') # end underline set -g -x LESS_TERMCAP_us (printf '\e[04;38;5;146m') # begin underline +set -g -x FZF_DEFAULT_COMMAND 'ffind | head -10000' +set -g -x FZF_DEFAULT_OPTS '--height 15' + # }}} # Python {{{ diff -r 2d5474ce49c7 -r c05932aa401f gitignore --- a/gitignore Tue Sep 14 11:37:23 2021 -0400 +++ b/gitignore Thu Nov 11 14:12:49 2021 -0500 @@ -16,5 +16,6 @@ *.lx64fsl *.dx64fsl .sjl-rsync-exclude +sjl-jupyter *.waiting diff -r 2d5474ce49c7 -r c05932aa401f lispwords --- a/lispwords Tue Sep 14 11:37:23 2021 -0400 +++ b/lispwords Thu Nov 11 14:12:49 2021 -0500 @@ -88,6 +88,7 @@ (1 gathering-vector) (1 multiple-value-bind*) (1 do-repeat do-range do-irange do-ring-buffer do-vector do-file) +(1 timing) ; qtools (1 qtenumcase) diff -r 2d5474ce49c7 -r c05932aa401f stumpwmrc --- a/stumpwmrc Tue Sep 14 11:37:23 2021 -0400 +++ b/stumpwmrc Thu Nov 11 14:12:49 2021 -0500 @@ -1,6 +1,7 @@ (in-package :stumpwm-user) (ql:quickload '(:losh :split-sequence :alexandria :parse-number :str :cl-ppcre :bordeaux-threads) :silent t) +(shadow 'window) (use-package :losh) @@ -775,6 +776,10 @@ (defvar *dunst* (run-shell-command "/usr/bin/dunst -conf ~/.dunstrc")) +(when (probe-file "/home/sjl/.stumpwmrc.local") + (load "/home/sjl/.stumpwmrc.local")) + + #;;; Scratch ------------------------------------------------------------------ (message (format nil "~S" (remove #\newline (run-shell-command "acpi" t)))) diff -r 2d5474ce49c7 -r c05932aa401f vim/vimrc --- a/vim/vimrc Tue Sep 14 11:37:23 2021 -0400 +++ b/vim/vimrc Thu Nov 11 14:12:49 2021 -0500 @@ -325,6 +325,14 @@ nnoremap y VV"+y nnoremap Y "+y +" Open +function Open(thing) + call system(['open', a:thing]) +endfunction + +nnoremap o "zyiW:call Open(@z) +vnoremap o "zy:call Open(@z) + " Yank to end of line nnoremap Y y$ @@ -492,6 +500,9 @@ nnoremap ]Z ]Sz= nnoremap [Z [Sz= +" Header Lines +nnoremap - o80a-kJ079lD + " Insert Mode Completion {{{ inoremap @@ -1135,6 +1146,7 @@ au BufNewFile,BufRead .abclrc set filetype=lisp au BufNewFile,BufRead .lisprc set filetype=lisp au BufNewFile,BufRead .stumpwmrc set filetype=lisp + au BufNewFile,BufRead .stumpwmrc.local set filetype=lisp au FileType lisp nnoremap U :syntax sync fromstart:redraw!:call TurnOnLispFolding() @@ -1816,116 +1828,17 @@ " }}} " Python {{{ -function! SelectTopLevelPythonHunk() "{{{ - " oh darling what have I done - - " if we're on toplevel line that ends in a :, drop down one line before - " we move on. this is bad and i feel bad. - let line = getline(".") - if len(line) > 0 && line[0] != " " && line[len(line) - 1] == ":" - normal! j - endif - - normal! v - - " use the non-bang version of normal here because we need to use the - " indentation script. this is also bad and i still feel bad. - normal ai - - " keep chomping upwards in the indentation stack til we get to something - " that's at the top level. its bad. - while getline(".")[0] == " " - normal ai - endwhile -endfunction "}}} - -function! OpenPythonRepl() "{{{ - "fucking kill me - NeoRepl fish -endfunction "}}} - -function! SendPythonParagraph() "{{{ - let view = winsaveview() - - execute "normal! ^vip\" - call NeoReplSendSelection() - - call winrestview(view) -endfunction "}}} -function! SendPythonTopLevelHunk() "{{{ - let view = winsaveview() - let old_z = @z - - call SelectTopLevelPythonHunk() - normal! gv"zy - call NeoReplSendRaw("%cpaste\n" . @z . "\n--\n") - - let @z = old_z - call winrestview(view) -endfunction "}}} -function! SendPythonSelection() "{{{ - let view = winsaveview() - let old_z = @z - - normal! gv"zy - call NeoReplSendRaw("%cpaste\n" . @z . "\n--\n") - - let @z = old_z - call winrestview(view) -endfunction "}}} -function! SendPythonBuffer() "{{{ - let view = winsaveview() - - execute "normal! ggVG\" - - normal! gv"zy - call NeoReplSendRaw("%cpaste\n" . @z . "\n--\n") - - call winrestview(view) -endfunction "}}} - augroup ft_python au! au FileType python setlocal define=^\s*\\(def\\\\|class\\) + au FileType python setlocal textwidth=100 " Jesus tapdancing Christ, built-in Python syntax, you couldn't let me " override this in a normal way, could you? au FileType python if exists("python_space_error_highlight") | unlet python_space_error_highlight | endif - " Strip REPL-session marks from just-pasted text - au FileType python nnoremap s mz`[v`]:v/\v^(\>\>\>\|[.][.][.])/dgv:s/\v^(\>\>\> \|[.][.][.] \|[.][.][.]$)//:noh`z - - " Set up some basic neorepl mappings. - " - " key desc mnemonic - " \o - connect neorepl [o]pen repl - " \l - send current line [l]ine - " \p - send current paragraph [p]aragraph - " \e - send top-level hunk [e]val - " \e - send selected hunk [e]val - " \r - send entire file [r]eload file - " \c - send ctrl-l [c]lear - - au FileType python nnoremap o :call OpenPythonRepl() - - " Send the current line to the REPL - au FileType python nnoremap l :call NeoReplSendCurrentLine() - - " Send the current paragraph to the REPL - au FileType python nnoremap p :call SendPythonParagraph() - - " " Send the current top-level hunk to the REPL - au FileType python nnoremap e :call SendPythonTopLevelHunk() - - " Send the current selection to the REPL - au FileType python vnoremap e :call SendPythonSelection() - - " Send the entire buffer to the REPL ([r]eload) - au FileType python nnoremap r :call SendPythonBuffer() - - " Clear the REPL - au FileType python nnoremap c :call NeoReplSendRaw(" ") + au FileType python nnoremap gi :Neoformat black augroup END " }}} diff -r 2d5474ce49c7 -r c05932aa401f weechat/alias.conf --- a/weechat/alias.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/alias.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- alias.conf +# weechat -- alias.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/autosort.conf --- a/weechat/autosort.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/autosort.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- autosort.conf +# weechat -- autosort.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/buflist.conf --- a/weechat/buflist.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/buflist.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- buflist.conf +# weechat -- buflist.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/charset.conf --- a/weechat/charset.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/charset.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- charset.conf +# weechat -- charset.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/exec.conf --- a/weechat/exec.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/exec.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- exec.conf +# weechat -- exec.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/fifo.conf --- a/weechat/fifo.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/fifo.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- fifo.conf +# weechat -- fifo.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/fset.conf --- a/weechat/fset.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/fset.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- fset.conf +# weechat -- fset.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/logger.conf --- a/weechat/logger.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/logger.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- logger.conf +# weechat -- logger.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/python.conf --- a/weechat/python.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/python.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- python.conf +# weechat -- python.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/relay.conf --- a/weechat/relay.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/relay.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- relay.conf +# weechat -- relay.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/ruby.conf --- a/weechat/ruby.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/ruby.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- ruby.conf +# weechat -- ruby.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/script.conf --- a/weechat/script.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/script.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- script.conf +# weechat -- script.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/spell.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/weechat/spell.conf Thu Nov 11 14:12:49 2021 -0500 @@ -0,0 +1,33 @@ +# +# weechat -- spell.conf +# +# WARNING: It is NOT recommended to edit this file by hand, +# especially if WeeChat is running. +# +# Use commands like /set or /fset to change settings in WeeChat. +# +# For more info, see: https://weechat.org/doc/quickstart +# + +[color] +misspelled = lightred +suggestion = default +suggestion_delimiter_dict = cyan +suggestion_delimiter_word = cyan + +[check] +commands = "away,command,cycle,kick,kickban,me,msg,notice,part,query,quit,topic" +default_dict = "" +during_search = off +enabled = off +real_time = off +suggestions = -1 +word_min_length = 2 + +[dict] + +[look] +suggestion_delimiter_dict = " / " +suggestion_delimiter_word = "," + +[option] diff -r 2d5474ce49c7 -r c05932aa401f weechat/trigger.conf --- a/weechat/trigger.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/trigger.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- trigger.conf +# weechat -- trigger.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/urlgrab.conf --- a/weechat/urlgrab.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/urlgrab.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- urlgrab.conf +# weechat -- urlgrab.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running. diff -r 2d5474ce49c7 -r c05932aa401f weechat/xfer.conf --- a/weechat/xfer.conf Tue Sep 14 11:37:23 2021 -0400 +++ b/weechat/xfer.conf Thu Nov 11 14:12:49 2021 -0500 @@ -1,5 +1,5 @@ # -# WeeChat -- xfer.conf +# weechat -- xfer.conf # # WARNING: It is NOT recommended to edit this file by hand, # especially if WeeChat is running.