# HG changeset patch # User Steve Losh # Date 1706794436 18000 # Node ID 4e0ee24c82a7fa7bc83e3fc9271b132d2c0b560b # Parent e33b124277939c13f3feb9771e9b433764fc3940 More diff -r e33b12427793 -r 4e0ee24c82a7 .hgsubstate --- a/.hgsubstate Thu Jan 25 14:51:12 2024 -0500 +++ b/.hgsubstate Thu Feb 01 08:33:56 2024 -0500 @@ -2,7 +2,7 @@ 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 mercurial/templates dcbfe065297d31823561ba787f51056c147aa682 vim/bundle/abolish 36e40f9ec91bdbf6f1adf408522a73a6925c3042 vim/bundle/ack -599e1bb1aee98e563132553cf8b7bc32cb402b75 vim/bundle/badwolf +cbc4da8970848ba4d3cb6ca2d9273a0114ff953b vim/bundle/badwolf b7f789f305b1c5b0b4623585e0f10adb417f2966 vim/bundle/boxdraw b542a7bc4d9bc5da8fb12e110fe7975131fb57a4 vim/bundle/clam e87cd90dc09c2a203e13af9704bd0ef79303d755 vim/bundle/commentary diff -r e33b12427793 -r 4e0ee24c82a7 bin/lesss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/lesss Thu Feb 01 08:33:56 2024 -0500 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -euo pipefail + +less -S "$@" diff -r e33b12427793 -r 4e0ee24c82a7 bin/remap-hggit-mapfile --- a/bin/remap-hggit-mapfile Thu Jan 25 14:51:12 2024 -0500 +++ b/bin/remap-hggit-mapfile Thu Feb 01 08:33:56 2024 -0500 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import collections @@ -22,11 +22,11 @@ def hg(*args): l = ["hg", "--repository", hg_dir] + list(args) - return subprocess.check_output(l).strip() + return subprocess.check_output(l).strip().decode('utf-8') def git(*args): l = ["git", "-C", git_dir] + list(args) - return subprocess.check_output(l).strip() + return subprocess.check_output(l).strip().decode('utf-8') def find_hg_root_revision(): rev = hg('log', '-r', 'roots(all())', nodetempl).split() diff -r e33b12427793 -r 4e0ee24c82a7 bin/st-apl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/st-apl Thu Feb 01 08:33:56 2024 -0500 @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -euo pipefail + +st -f 'BQN386 Unicode:style=Regular:size=12' "$@" diff -r e33b12427793 -r 4e0ee24c82a7 lisp/clhs.lisp --- a/lisp/clhs.lisp Thu Jan 25 14:51:12 2024 -0500 +++ b/lisp/clhs.lisp Thu Feb 01 08:33:56 2024 -0500 @@ -77,7 +77,8 @@ :direction :output :if-exists :supersede :if-does-not-exist :create) - (prin1 symbols out)) + (let ((*print-length* nil)) + (prin1 symbols out))) symbols))) (defun symbol-map () diff -r e33b12427793 -r 4e0ee24c82a7 stumpwmrc --- a/stumpwmrc Thu Jan 25 14:51:12 2024 -0500 +++ b/stumpwmrc Thu Feb 01 08:33:56 2024 -0500 @@ -396,7 +396,7 @@ (hostcase ((:gro :juss) (loop :with laptop = "eDP" :with extern = (hostcase (:gro "DisplayPort-0") - (:juss "DisplayPort-1")) + (:juss "HDMI-A-0")) :for (output commands) :in `((,laptop ("--auto")) (,laptop ("--primary")) (,extern ("--off"))) @@ -408,7 +408,7 @@ (hostcase ((:gro :juss) (loop :with laptop = "eDP" :with extern = (hostcase (:gro "DisplayPort-0") - (:juss "DisplayPort-1")) + (:juss "HDMI-A-0")) :for (output commands) :in `((,extern ("--auto")) (,extern ("--primary")) (,laptop ("--off"))) diff -r e33b12427793 -r 4e0ee24c82a7 vim/custom-dictionary.utf-8.add --- a/vim/custom-dictionary.utf-8.add Thu Jan 25 14:51:12 2024 -0500 +++ b/vim/custom-dictionary.utf-8.add Thu Feb 01 08:33:56 2024 -0500 @@ -405,3 +405,8 @@ Dhatri OOMs BI602 +lactamase +backends +webapp +webapps +B2 diff -r e33b12427793 -r 4e0ee24c82a7 vim/syntax/lisp.vim --- a/vim/syntax/lisp.vim Thu Jan 25 14:51:12 2024 -0500 +++ b/vim/syntax/lisp.vim Thu Feb 01 08:33:56 2024 -0500 @@ -63,8 +63,9 @@ " start prefixparameters modifiers directive syn match lispStringFormatDirective contained /\v[~](([-+]?[0-9]*|'.),?)*(:\@|\@:|:|\@)?./ +syn match lispStringAprilComment contained /\v⍝(.)*/ -syn region lispString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=lispStringFormatDirective,@Spell +syn region lispString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=lispStringFormatDirective,lispStringAprilComment,@Spell if exists("g:lisp_instring") syn region lispInString keepend matchgroup=Delimiter start=+"(+rs=s+1 skip=+|.\{-}|+ matchgroup=Delimiter end=+)"+ contains=@lispBaseListCluster,lispInStringString @@ -106,6 +107,7 @@ hi def link lispAtomMark lispMark hi def link lispInStringString lispString hi def link lispStringFormatDirective SpecialChar + hi def link lispStringAprilComment lispComment hi def link lispAtom Identifier hi def link lispAtomBarSymbol Special diff -r e33b12427793 -r 4e0ee24c82a7 vim/vimrc --- a/vim/vimrc Thu Jan 25 14:51:12 2024 -0500 +++ b/vim/vimrc Thu Feb 01 08:33:56 2024 -0500 @@ -55,6 +55,8 @@ " Highlight VCS conflict markers match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' +nnoremap B :call GoodWolfToggleBoldStrings() + " }}} " Convenience mappings ---------------------------------------------------- {{{ @@ -213,6 +215,73 @@ " }}} " Filetype-specific ------------------------------------------------------- {{{ +" April {{{ +" +augroup ft_commonlisp_april " {{{ + au! + + au FileType lisp inoremap ; ⍝ + au FileType lisp inoremap i ⍳ + au FileType lisp inoremap r ⍴ + au FileType lisp inoremap e ∊ + au FileType lisp inoremap _i ⍸ + au FileType lisp inoremap _, ⍪ + + au FileType lisp inoremap 1 ¨ + au FileType lisp inoremap F ⍨ + au FileType lisp inoremap P ⍣ + + au FileType lisp inoremap * × + au FileType lisp inoremap / ÷ + au FileType lisp inoremap 0 ∘ + au FileType lisp inoremap - ¯ + au FileType lisp inoremap l ⍟ + + au FileType lisp inoremap c ⌈ + au FileType lisp inoremap f ⌊ + + au FileType lisp inoremap ← + au FileType lisp inoremap < ← + au FileType lisp inoremap > → + au FileType lisp inoremap ^ ↑ + au FileType lisp inoremap v ↓ + + au FileType lisp inoremap d ∆ + au FileType lisp inoremap D ⍙ + + au FileType lisp inoremap G^ ⍋ + au FileType lisp inoremap Gv ⍒ + + au FileType lisp inoremap oo ○ + au FileType lisp inoremap o\| ⌽ + au FileType lisp inoremap o\ ⍉ + au FileType lisp inoremap o- ⊖ + + au FileType lisp inoremap A ∧ + au FileType lisp inoremap O ∨ + + au FileType lisp inoremap =< ≤ + au FileType lisp inoremap =< ≥ + au FileType lisp inoremap =/ ≠ + au FileType lisp inoremap === ≡ + au FileType lisp inoremap ==/ ≢ + + au FileType lisp inoremap q ⎕ + au FileType lisp inoremap Q ⌷ + au FileType lisp inoremap t ⊢ + + au FileType lisp inoremap u ∪ + au FileType lisp inoremap U ∩ + au FileType lisp inoremap + ⌿ + au FileType lisp inoremap [ ⊂ + au FileType lisp inoremap ] ⊃ + + au FileType lisp inoremap a ⍺ + au FileType lisp inoremap w ⍵ + au FileType lisp inoremap z ⍬ +augroup END " }}} + +" }}} " Assembly {{{ augroup ft_asm @@ -549,57 +618,6 @@ " Writing au FileType lisp noremap = I; => - - " April - au FileType lisp inoremap ; ⍝ - au FileType lisp inoremap i ⍳ - au FileType lisp inoremap r ⍴ - au FileType lisp inoremap e ∊ - au FileType lisp inoremap _i ⍸ - au FileType lisp inoremap _, ⍪ - au FileType lisp inoremap :~ ⍨ - au FileType lisp inoremap :^ ¨ - - au FileType lisp inoremap * × - au FileType lisp inoremap / ÷ - au FileType lisp inoremap 0 ∘ - au FileType lisp inoremap - ¯ - - au FileType lisp inoremap c ⌈ - au FileType lisp inoremap f ⌊ - - au FileType lisp inoremap < ← - au FileType lisp inoremap > → - au FileType lisp inoremap ^ ↑ - au FileType lisp inoremap v ↓ - - au FileType lisp inoremap G^ ⍋ - au FileType lisp inoremap Gv ⍒ - - au FileType lisp inoremap o\| ⌽ - au FileType lisp inoremap o/ ⍉ - au FileType lisp inoremap o- ⊖ - - au FileType lisp inoremap A ∧ - au FileType lisp inoremap O ∨ - - au FileType lisp inoremap =< ≤ - au FileType lisp inoremap =< ≥ - au FileType lisp inoremap =/ ≠ - au FileType lisp inoremap === ≡ - au FileType lisp inoremap ==/ ≢ - - au FileType lisp inoremap q ⎕ - au FileType lisp inoremap Q ⌷ - au FileType lisp inoremap t ⊢ - - au FileType lisp inoremap u ∪ - au FileType lisp inoremap U ∩ - au FileType lisp inoremap + ⌿ - au FileType lisp inoremap [ ⊂ - au FileType lisp inoremap ] ⊃ - - au FileType lisp inoremap z ⍬ augroup END " }}} " }}} @@ -2024,7 +2042,7 @@ " Windowswap {{{ let g:windowswap_map_keys = 0 "prevent default bindings -nnoremap ws :call WindowSwap#EasyWindowSwap() +nnoremap :call WindowSwap#EasyWindowSwap() " }}} diff -r e33b12427793 -r 4e0ee24c82a7 vim/vimrc-minimal --- a/vim/vimrc-minimal Thu Jan 25 14:51:12 2024 -0500 +++ b/vim/vimrc-minimal Thu Feb 01 08:33:56 2024 -0500 @@ -410,6 +410,9 @@ nnoremap :resize +3 nnoremap :resize -3 +" Newline without having to go to the end of the line +inoremap o + " }}} " Searching and movement -------------------------------------------------- {{{