6b3ab420adThe status bar was five hardcoded tangere-dark colours, so in light mode the
pale #fdfdd9 text landed on a white background and became unreadable. That was
the real reason Auto appearance "never worked with the terminal setup" — ghostty
was switching correctly all along.
Split the colours into tmux-light.conf and tmux-dark.conf. The dark file is
extracted byte-exact from the previous config; the light file is the same layout
with each colour swapped for the tangere-light palette entry at the same index,
so roles are preserved (text on an accent uses the theme background, which
inverts from #1a2938 to #fdfdfa).
tmux 3.6+ learns the terminal's theme over OSC 2031, so this keys off the
appearance change itself rather than a schedule, and behaves identically whether
that came from Auto at sunrise/sunset or a manual toggle. Three hooks: the two
theme hooks react to a change, and client-attached covers a client attaching
mid-way, since those two only fire on a change. Sourcing is idempotent so the
overlap is harmless.
This replaces the dark-mode-notify launchd agent removed in 59d5622, which could
not have worked: it re-sourced .zshrc inside each shell, but the status bar
belongs to the tmux server.
Verified by round trip: flipping to Light switched #{client_theme} and applied
the light palette, and returning to Dark restored it. A running nvim does not
follow a live change (docs: the TUI sets 'background' on startup); noted in the
README.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
71 lines
3.6 KiB
Shell
Executable file
71 lines
3.6 KiB
Shell
Executable file
#!/usr/bin/env zsh
|
|
|
|
# Current dir
|
|
BASEDIR=$(pwd)
|
|
|
|
# ln the various files
|
|
echo "Sym-linking the various config files"
|
|
test -L $HOME/.gitignore || ln -f -s $BASEDIR/gitignore $HOME/.gitignore
|
|
test -L $HOME/.hushlogin || ln -f -s $BASEDIR/hushlogin $HOME/.hushlogin
|
|
test -L $HOME/.tmux.conf || ln -f -s $BASEDIR/tmux $HOME/.tmux.conf
|
|
test -L $HOME/.tmux-light.conf || ln -f -s $BASEDIR/tmux-light.conf $HOME/.tmux-light.conf
|
|
test -L $HOME/.tmux-dark.conf || ln -f -s $BASEDIR/tmux-dark.conf $HOME/.tmux-dark.conf
|
|
test -d $HOME/.config/sheldon || mkdir $HOME/.config/sheldon
|
|
test -L $HOME/.config/sheldon/plugins.toml || ln -f -s $BASEDIR/sheldon.toml $HOME/.config/sheldon/plugins.toml
|
|
test -L $HOME/.zsh || ln -f -s $BASEDIR/zsh $HOME/.zsh
|
|
test -L $HOME/.zshrc || ln -f -s $BASEDIR/zshrc.zsh $HOME/.zshrc
|
|
test -d $HOME/.config/delta || mkdir $HOME/.config/delta
|
|
test -L $HOME/.config/delta/themes.gitconfig || ln -f -s $BASEDIR/delta-themes.gitconfig $HOME/.config/delta/themes.gitconfig
|
|
|
|
# If ghostty is installed on the system then setup the config
|
|
if (( ${+commands[ghostty]} )); then
|
|
test -d $HOME/.config/ghostty || mkdir $HOME/.config/ghostty
|
|
test -L $HOME/.config/ghostty/config || ln -f -s $BASEDIR/ghostty/config $HOME/.config/ghostty/config
|
|
test -d $HOME/.config/ghostty/themes || mkdir $HOME/.config/ghostty/themes
|
|
test -L $HOME/.config/ghostty/themes/tangere-dark.conf || ln -f -s $BASEDIR/ghostty/themes/tangere-dark $HOME/.config/ghostty/themes/tangere-dark.conf
|
|
test -L $HOME/.config/ghostty/themes/tangere-light.conf || ln -f -s $BASEDIR/ghostty/themes/tangere-light $HOME/.config/ghostty/themes/tangere-light.conf
|
|
fi
|
|
|
|
# setup gpg conf
|
|
test -d $HOME/.gnupg || mkdir $HOME/.gnupg
|
|
cp -f $BASEDIR/gnupg/common.conf $HOME/.gnupg/common.conf
|
|
cp -f $BASEDIR/gnupg/dirmngr.conf $HOME/.gnupg/dirmngr.conf
|
|
cp -f $BASEDIR/gnupg/gpg.conf $HOME/.gnupg/gpg.conf
|
|
chmod 700 $HOME/.gnupg
|
|
chmod 640 $HOME/.gnupg/common.conf
|
|
chmod 640 $HOME/.gnupg/dirmngr.conf
|
|
chmod 640 $HOME/.gnupg/gpg.conf
|
|
|
|
echo "Setting up NeoVim"
|
|
test -d $HOME/.config/nvim || mkdir -p $HOME/.config/nvim
|
|
test -d $HOME/.local/share/nvim || mkdir -p $HOME/.local/share/nvim
|
|
test -L $HOME/.config/nvim/init.lua || ln -f -s $BASEDIR/neovim/init.lua $HOME/.config/nvim/init.lua
|
|
test -L $HOME/.config/nvim/nvim-pack-lock.json || ln -f -s $BASEDIR/neovim/nvim-pack-lock.json $HOME/.config/nvim/nvim-pack-lock.json
|
|
test -d $HOME/.config/nvim/lua || mkdir -p $HOME/.config/nvim/lua
|
|
test -L $HOME/.config/nvim/lua/config || ln -f -s $BASEDIR/neovim/config $HOME/.config/nvim/lua/config
|
|
test -d $HOME/.config/nvim/lsp || mkdir -p $HOME/.config/nvim/lsp
|
|
test -L $HOME/.config/nvim/lsp/phpactor.lua || ln -f -s $BASEDIR/neovim/lsp/phpactor.lua $HOME/.config/nvim/lsp/phpactor.lua
|
|
|
|
# Claude Code statusline
|
|
test -d $HOME/.claude || mkdir $HOME/.claude
|
|
ln -f -s $BASEDIR/claude/statusline.isaacaudet.sh $HOME/.claude/statusline.sh
|
|
|
|
# Copy rather than symlink, so an ad-hoc `git config --global` writes to $HOME
|
|
# and not into the repo.
|
|
echo "For compatibility we shall copy the global gitconfig"
|
|
cp $BASEDIR/gitconfig $HOME/.gitconfig
|
|
|
|
# Identity and signing live in ~/.gitconfig.local, which the above includes.
|
|
# It is per-machine and untracked, so seed it from the template. Never
|
|
# overwrite an existing one: it holds the real signing key.
|
|
test -e $HOME/.gitconfig.local || {
|
|
echo "Seeding ~/.gitconfig.local from template — fill in your identity"
|
|
cp $BASEDIR/gitconfig.local.template $HOME/.gitconfig.local
|
|
}
|
|
|
|
# Copy the progs into the local bin dir
|
|
rsync -av --chmod=+x $BASEDIR/bin/ $HOME/.local/bin/
|
|
|
|
# Source zshrc
|
|
echo "And finally, source the .zshrc"
|
|
source $HOME/.zshrc
|