Batched updates/tweaks/additions

Some (or maybe many) of these changes are old.  I just never committed
them.  Realistically, I won't get around to creating focused, clean
commits, so this commit is better than nothing.

home/XCompose

@@ -16,5 +16,6 @@ include "%L"
 <Multi_key> <p> <e> <n> <g> <u> <i> <n> : "🐧"
 <Multi_key> <colon> <parenright> : "🙂"
 <Multi_key> <colon> <parenleft> : "🙁"
+<Multi_key> <parenleft> <colon> : "🙃"
 
 # vim: ft=conf

home/config/i3/dmesg-workspace.json

@@ -0,0 +1,11 @@
+{
+  "layout": "splith",
+  "nodes": [
+    {
+      "swallows": [{ "title": "^dmesg$" }]
+    },
+    {
+      "swallows": [{ "title": "^journalctl$" }]
+    }
+  ]
+}

home/gitconfig

@@ -8,6 +8,8 @@
 	pager = diff-so-fancy | less --tabs=4 -RFX
 [commit]
 	status = false
+[diff]
+	algorithm = histogram
 [merge]
 	; I used `vimdiff` and `nvim -d` before, but Vim is rubbish at 3-way diffs.  Meld
 	; doesn't seem too bad.  TODO: Could we make Vim work acceptably well somehow?
@@ -22,7 +24,7 @@
 	follow = true
 [alias]
 	amend = commit --amend
-	ci = commit
+	ci = commit --quiet
 	co = checkout
 	ff = merge --ff-only
 	; See <https://stackoverflow.com/a/35075021>.  With recent versions of Git,

home/inputrc

@@ -28,3 +28,5 @@ set colored-stats on
 set completion-ignore-case on
 set colored-completion-prefix
 set mark-symlinked-directories on
+
+set enable-bracketed-paste on

home/vim/vimrc

@@ -26,6 +26,12 @@ set history=10000 " Vim's default: 50.  Neovim's default: 10000.
 set incsearch     " Search while typing the search command and...
 set hlsearch      " ...hightlight matches.
 
+set shortmess-=S
+set shortmess+=F
+
+let &t_SI = "\e[6 q"
+let &t_EI = "\e[2 q"
+
 set maxmem=2000000    " Lots of memory for each buffer.
 set maxmemtot=2000000 " Lots of memory for all buffers together.
 

home/xresources/xterm

@@ -30,7 +30,7 @@ XTerm.termName: xterm-256color
 ! Taken from <https://wiki.archlinux.org/title/Xterm>:
 ! This will "enable UTF-8 mode" (xterm(1)).
 XTerm*VT100.locale:    true
-XTerm*VT100.saveLines: 8192
+XTerm*VT100.saveLines: 16384
 
 ! See <https://www.leonerd.org.uk/hacks/hints/xterm-8bit.html>.  The values for `utf8`,
 ! `eightBitControl`, and `eightBitOutput` should be the defaults already.

misc/keybind-scripts/dmesg

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+workspace_exists=$(i3-msg -t get_workspaces | jq 'any (.name == "dmesg")')
+i3-msg 'workspace dmesg'
+[[ $workspace_exists == 'true' ]] && exit
+
+i3-msg -q 'append_layout ~/.config/i3/dmesg-workspace.json'
+
+xterm -title dmesg -e 'sudo dmesg --follow --human' &
+xterm -title journalctl -e 'journalctl --dmesg --follow -n 61 -o cat' &

misc/keybind-scripts/fzf-command-runner

@@ -11,9 +11,13 @@ lock
 dates
 background::~/dotfiles/misc/keybind-scripts/wifail::wifail
 background::~/dotfiles/misc/keybind-scripts/ethinfo::ethinfo
-killall xbindkeys; xbindkeys
-xrdb -merge ~/.xresources/* && { killall xbindkeys; xbindkeys; }
+background::~/dotfiles/misc/keybind-scripts/dmesg::dmesg
 killall -HUP xbindkeys
+killall xbindkeys; xbindkeys
+killall xcape; xcape
+cat ~/.xresources/* | xrdb
+cat ~/.xresources/* | xrdb -merge
+cat ~/.xresources/* | xrdb -merge && { killall xbindkeys; xbindkeys; }
 $FIREFOX --new-tab $(gatewayip) # try to open a router's web interface
 cat /sys/class/power_supply/BAT0/{energy,charge}_{now,full} 2>/dev/null
 auracle outdated
@@ -58,8 +62,13 @@ browse::https://meribold.org::meribold.org
 browse::https://staging.meribold.org::staging.meribold.org
 browse::https://testing.meribold.org::testing.meribold.org
 browse::snapcraft.io/muccadoro/metrics
-browse::https://www.fastmail.com::fastmail.com
-browse::https://www.fastmail.com/contacts::fastmail.com/contacts
+browse::https://app.fastmail.com::fastmail.com
+browse::https://app.fastmail.com/contacts::fastmail.com/contacts
+browse::https://app.fastmail.com/calendar::fastmail.com/calendar
+browse::https://app.fastmail.com/settings/masked
+browse::https://app.fastmail.com/settings/masked/new
+browse::https://app.fastmail.com/mail/compose
+browse::https://console.aws.amazon.com::console.aws.amazon.com
 browse::file:///usr/share/doc/neomutt/manual.html
 browse::file:///usr/share/doc/arch-wiki/html/en/Network_configuration.html
 browse::moz-extension://bbd71618-3b7d-474d-94c7-2e062c6a5870/onetab.html::OneTab

misc/oneliners.bash

@@ -8,7 +8,7 @@ nx sync --no-resolvemerge --no-commit
 nx sync --no-resolvemerge --no-commit --no-pull
 nx copy --fast --all --to esgaroth
 nx copy --fast --all --to s3
-nx copy --fast --all --to t5a
+nx copy --fast --all --to s5g
 nx copy --fast --all -J4 --to esgaroth
 mirrorlist=$(reflector --age 1 --latest 200 --sort rate -n 10) && sudo tee /etc/pacman.d/mirrorlist <<< "$mirrorlist" # generate new mirror list for pacman
 git check-attr --all
@@ -63,7 +63,7 @@ latexmk -pdf -shell-escape
 mbsync gmail && notmuch new
 mkcd $(date -I)
 mkdir -p delete-me && feh --action 'mv %N delete-me' .
-mount ~/t5a
+mount ~/s5g
 mount ~/v8x # mount my USB drive (this only works because of an entry in my fstab(5))
 mount ~/v8x && { git pull usb; umount ~/v8x; } # pull from my USB drive
 mount ~/v8x && { git push usb; umount ~/v8x; } # push to my USB drive
@@ -76,7 +76,7 @@ neomutt -s 'Hi.' '[email protected]' <<< ''
 nohup xdg-open file &>/dev/null <&1 &
 nx describe esgaroth Esgaroth
 nx describe s3 'Amazon S3'
-nx describe t5a 'Toshiba USB HDD'
+nx describe s5g 'Samsung T7 Shield'
 nx initremote esgaroth type=rsync rsyncurl=esgaroth:DIR encryption=none
 nx initremote foo type=S3 --whatelse
 nx move --unused --to esgaroth
@@ -107,7 +107,6 @@ sudo iw dev wlan0 scan | less
 sudo pacman -D --asdeps PACKAGE
 sudo pacman -Syu
 sudo sysctl kernel.sysrq=1
-sudo wpa_supplicant -i wlan0 -c ~/.wpa_supplicant.conf
 telnet mapscii.me
 trans :zh-TW -b - | s
 vim -u NONE

root/usr/local/share/fortune/meribold

@@ -11,7 +11,7 @@ I often enjoy rhinophytonecrophilia.
 %
 The last human freedom is to give purpose to one's circumstances.
 %
-Aiya Eärendil Elenion Ancalima!
+Aiya Eärendil elenion ancalima!
 %
 It's not a real choice.  It's an apparent choice.  Like choosing a brand of detergent.
 Whether you buy Ivory Snow or Tide, they're both owned by Proctor & Gamble.  This doesn't