# HG changeset patch # User Steve Losh # Date 1715178138 14400 # Node ID 4e1d6d6873fec27221e6cc1ae0fe98bd8119a357 # Parent 4f28fbfd7d636664d89bc0e10fdba5015038c590 More diff -r 4f28fbfd7d63 -r 4e1d6d6873fe .hgsubstate --- a/.hgsubstate Tue Apr 09 09:20:04 2024 -0400 +++ b/.hgsubstate Wed May 08 10:22:18 2024 -0400 @@ -2,7 +2,7 @@ 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates dcbfe065297d31823561ba787f51056c147aa682 vim/bundle/abolish 36e40f9ec91bdbf6f1adf408522a73a6925c3042 vim/bundle/ack -fbbdfbde7b877292940871637c57a1ee8958e365 vim/bundle/badwolf +ab888cd09b71e17d1d46ef893d6131213d0b1426 vim/bundle/badwolf b7f789f305b1c5b0b4623585e0f10adb417f2966 vim/bundle/boxdraw b542a7bc4d9bc5da8fb12e110fe7975131fb57a4 vim/bundle/clam e87cd90dc09c2a203e13af9704bd0ef79303d755 vim/bundle/commentary @@ -13,7 +13,7 @@ 7fcea1a08423da3012aac87f5224738c85d212a1 vim/bundle/gnupg 0d57b080f9fae8573c688b6679b31eb1666edc4c vim/bundle/gnuplot 1d84591fff04caebab75cba2294fc3843f0a4a29 vim/bundle/gundo -fccd580f5f11d576169ee347907c9fbd77af410a vim/bundle/html5 +485f2cd62162c81e56d8604b4c630f0b5ef69d1f vim/bundle/html5 dd84369d731bcb8feee0901cbb9b63a2b219bf28 vim/bundle/javascript e2d7fcd682a461a3951e8b5067cc8a0083e75e35 vim/bundle/markdown 964c66fa22500ae7375114342d212d7fe15da341 vim/bundle/neoformat diff -r 4f28fbfd7d63 -r 4e1d6d6873fe bin/longcat --- a/bin/longcat Tue Apr 09 09:20:04 2024 -0400 +++ b/bin/longcat Wed May 08 10:22:18 2024 -0400 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys @@ -7,25 +7,24 @@ else: n = 20 -print r''' - /\___/\ - / \ - | o o | - \ # | - \ _|_ / - / \______ - / _______ ___ \ - |_____ \ \__/ +print (r''' + /\___/\ + / \ + | o o | + \ # | + \ _|_ / + / \______ + / _______ ___ \ + |_____ \ \__/ | \__/ - | | -''', -print ' | |\n' * n, -print r''' | | + | |'''), +print(' | |\n' * n, end='') +print(r''' | | / \ / ____ \ | / \ | | | | | / | | \ \__/ \__/ -''' +''') diff -r 4f28fbfd7d63 -r 4e1d6d6873fe fish/config.fish --- a/fish/config.fish Tue Apr 09 09:20:04 2024 -0400 +++ b/fish/config.fish Wed May 08 10:22:18 2024 -0400 @@ -6,7 +6,6 @@ function eg; nvim ~/.gitconfig; end function eh; nvim ~/.hgrc; end function ei; hg -R ~/src/inventory/ pull -u; and nvim ~/src/inventory/inventory.markdown; and hg -R ~/src/inventory/ ci -m 'Update inventory'; and hg -R ~/src/inventory/ push; end -function el; cd ~/Dropbox/life; nvim .; end function em; nvim ~/.mutt/muttrc; end function es; pushd ~/src/dotfiles/stumpwm; e stumpwmrc; popd; end function ev; nvim ~/.vimrc; end diff -r 4f28fbfd7d63 -r 4e1d6d6873fe lispwords --- a/lispwords Tue Apr 09 09:20:04 2024 -0400 +++ b/lispwords Wed May 08 10:22:18 2024 -0400 @@ -150,4 +150,13 @@ (1 let!) ; sqlite -(1 execute-non-query execute-script execute-to-list execute-single) +(1 execute-non-query execute-script execute-to-list execute-single execute-non-query/named execute-single/named execute-to-list/named) + +; easy-routes +(3 defroute) + +; djula +(2 render-template*) + +; cl-who +(1 who) diff -r 4f28fbfd7d63 -r 4e1d6d6873fe md-to-html/template.html --- a/md-to-html/template.html Tue Apr 09 09:20:04 2024 -0400 +++ b/md-to-html/template.html Wed May 08 10:22:18 2024 -0400 @@ -1,58 +1,63 @@ - - - $title$ - - - -

$title$

$toc$

+ + +

$title$

Table of contents

$toc$

+ $body$ - + + diff -r 4f28fbfd7d63 -r 4e1d6d6873fe sqliterc --- a/sqliterc Tue Apr 09 09:20:04 2024 -0400 +++ b/sqliterc Wed May 08 10:22:18 2024 -0400 @@ -1,5 +1,7 @@ .timer on .headers on -.mode tabs +.mode columns + +.prompt "\nsqlite> " "> " .nullvalue ∅' diff -r 4f28fbfd7d63 -r 4e1d6d6873fe stumpwm/applications.lisp --- a/stumpwm/applications.lisp Tue Apr 09 09:20:04 2024 -0400 +++ b/stumpwm/applications.lisp Wed May 08 10:22:18 2024 -0400 @@ -26,10 +26,6 @@ (defcommand gcontrol () () (run-or-raise "gcontrol" '(:class "Gnome-control-center"))) -(defcommand zoom () () - (when-let-window (w "^Zoom Meeting.*") - (focus-window w t))) - (defcommand papers () () (run-or-raise "jabref" '(:class "org.jabref.gui.MainApplication"))) diff -r 4f28fbfd7d63 -r 4e1d6d6873fe stumpwm/key-mapping.lisp --- a/stumpwm/key-mapping.lisp Tue Apr 09 09:20:04 2024 -0400 +++ b/stumpwm/key-mapping.lisp Wed May 08 10:22:18 2024 -0400 @@ -24,7 +24,7 @@ ("H-M" "mark") ("H-SunPageUp" "st-font-up") ("H-SunPageDown" "st-font-down") - ("H-0" "fullscreen") + ("H-z" "fullscreen") ("H-F4" "switch-yubikeys") ("H-\\" "pass-personal") ("H-|" "generate-password") @@ -34,9 +34,6 @@ ("H-O" "spotify") ("H-o" "files") ("H-P" "papers") - ("H-z" "zoom") - ("H-Z" "toggle-zoom-mute") - ("C-H-Z" "end-zoom") ("F26" "prev") ("S-F26" "next") ("H-q" "exec lock-screen") @@ -115,7 +112,8 @@ ("H-w" "delete") ("H-W" "kill") ("H-BackSpace" "remove") - ("S-H-BackSpace" "kill-and-remove")) + ("S-H-BackSpace" "kill-and-remove") + ("H-Delete" "gkill")) (define-top-keys ;; naming ("H-'" "title")) @@ -177,8 +175,8 @@ ;;; | | | | | +---------+ | | ;;; | | v | | | | | | ;;; +----------+----------+----------+ | next | | | -;;; | split | split | FULL | | | +--------+ -;;; | [|] | [-] | SCREEN | +---------+ +;;; | split | FULL | split | | | +--------+ +;;; | [-] | SCREEN | [|] | +---------+ ;;; | | | | | | ;;; +----------+----------+----------+ | prev | ;;; | | @@ -192,10 +190,11 @@ ("M-s-Right" "gnext") ("s-Home" "next-in-frame") ("s-End" "prev-in-frame") - ("s-)" "sane-hsplit") - ("s-_" "sane-vsplit") + ("s-+" "sane-hsplit") + ("s-)" "sane-vsplit") + ("s-_" "fullscreen") ("s-Delete" "remove") - ("s-+" "fullscreen")) + ) ;; (stumpwm::unbind-remapped-keys) diff -r 4f28fbfd7d63 -r 4e1d6d6873fe stumpwm/miscellaneous.lisp --- a/stumpwm/miscellaneous.lisp Tue Apr 09 09:20:04 2024 -0400 +++ b/stumpwm/miscellaneous.lisp Wed May 08 10:22:18 2024 -0400 @@ -72,22 +72,6 @@ (defcommand mark (thing) ((:string "Mark: ")) (run-shell-command (format nil "mark ~A" thing))) -(defcommand toggle-zoom-mute () () - (when-let-window (win "^Zoom Meeting.*") - ;; Zoom stupidly won't accept the shortcut unless it's in focus - (unless (eql (window-group win) (current-group)) - ;; jesus christ stump just export switch-to-group come on - (gselect (princ-to-string (group-number (window-group win))))) - (focus-window win t) - (meta (kbd "M-a")))) - -(defcommand end-zoom () () - (when-let-window (win "^Zoom Meeting.*") - (kill-window win)) - (sleep 2) - (when-let-window (win "^Zoom -.*") - (kill-window win))) - (defcommand clear-notifications () () (run-shell-command "dunstctl close-all")) diff -r 4f28fbfd7d63 -r 4e1d6d6873fe stumpwm/sound.lisp --- a/stumpwm/sound.lisp Tue Apr 09 09:20:04 2024 -0400 +++ b/stumpwm/sound.lisp Wed May 08 10:22:18 2024 -0400 @@ -13,6 +13,7 @@ (defcommand mute () () (run-shell-command "mute") + (volume/uncache) (echo "Muted.")) (defcommand volume-up () () diff -r 4f28fbfd7d63 -r 4e1d6d6873fe vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Tue Apr 09 09:20:04 2024 -0400 +++ b/vim/custom-dictionary.utf-8.add Wed May 08 10:22:18 2024 -0400 @@ -435,3 +435,20 @@ polycomb Cristian DBvolve +sqlite +Bree +Midgewater +Chetwood +noncanonical +XRT +Snakemake's +RiboTIE +rawdogging +multimapping +Riboseq +X11 +JS +GRSA +CCTC +BLASTs +mosaicism diff -r 4f28fbfd7d63 -r 4e1d6d6873fe vim/vimrc --- a/vim/vimrc Tue Apr 09 09:20:04 2024 -0400 +++ b/vim/vimrc Wed May 08 10:22:18 2024 -0400 @@ -940,13 +940,16 @@ " }}} " HTML, Django, Jinja, Dram, Go, Kill Me {{{ -let g:html_indent_tags = ['p', 'li'] +let g:html_indent_tags = ['p', 'li', 'div'] + +let g:html_indent_inctags = "html,body,head,tbody,div" augroup ft_html au! - au BufNewFile,BufRead *.html setlocal filetype=gohtmltmpl + au BufNewFile,BufRead *.djula setlocal filetype=htmldjango au BufNewFile,BufRead *.dram setlocal filetype=htmldjango + au BufNewFile,BufRead *.ten setlocal filetype=htmldjango au FileType html,jinja,htmldjango,gohtmltmpl setlocal foldmethod=manual @@ -1108,8 +1111,6 @@ au Filetype markdown nnoremap 3 mzI###`zllll au Filetype markdown nnoremap 4 mzI####`zlllll - au Filetype markdown inoremap

mz?^ *\*?e"zy0:noh`z"zpA* a - au Filetype markdown inoremap

mz?^ *\*?e"zy0:noh`z"zpA * a au Filetype markdown inoremap

mz0xx`za au Filetype markdown inoremap

mzI `zlla augroup END @@ -1377,6 +1378,28 @@ augroup END " }}} +" TEN templates {{{ + +function! RecompileTENTemplates() "{{{ + let systems = split(system('ls -1 *.asd | grep -v test | cut -d. -f1 | uniq')) " its fine + if len(systems) == 0 + echom "Could not find any .asd files..." + return + elseif len(systems) > 1 + echom "Found too many any .asd files..." + return + endif + + call vlime#plugin#SendToREPL("(ql:quickload :" . systems[0] . ")") +endfunction "}}} + +augroup ft_ten + au! + + au BufNewFile,BufRead *.ten nnoremap q :call RecompileTENTemplates() +augroup END + +" }}} " Vagrant {{{ augroup ft_vagrant