Merge remote-tracking branch 'origin/master' - citadel - My dotfiles, scripts and nix configs

commit 28243dbdb0e1f212779a876c33038968585e74db
parent 16c9c50267e3d941054efc7bf37c665359909de9
Author: William Casarin <jb55@jb55.com>
Date:   Fri, 17 Nov 2023 06:32:20 -0800

Merge remote-tracking branch 'origin/master'

	citadel My dotfiles, scripts and nix configs
	git clone git://jb55.com/citadel
	Log \| Files \| Refs \| README \| LICENSE