unify zsh+bash shell config; fix zsh startup

Support either shell as the login shell via stow selection (merges the
bashed branch in). shell/ holds shared POSIX env + interactive config;
each shell loads its own rc natively.

- zsh: add .zshenv (sets ZDOTDIR+env early), rename rc -> .zshrc, add
  login-only .zprofile (pyenv --path)
- bash: add ~/.bash_profile + ~/.bashrc stubs, .config/bash/{rc,prompt}
- shell: profile is POSIX env-only (no zsh-rc source); path rewritten
  POSIX + idempotent (flat ~/.local/bin, no subdir recursion); new
  interactive sources aliases/functions + pyenv shims
- drop dead shell/.zprofile symlink; move ZDOTDIR out of exports

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

bash/.bash_profile

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# Bash login shell. Everything a non-login shell gets lives in ~/.bashrc, so
+# source it, then add login-only bits.
+[ -r ~/.bashrc ] && . ~/.bashrc
+
+# pyenv shims dir (login only); PYENV_ROOT comes from ~/.config/shell/exports.
+command -v pyenv >/dev/null 2>&1 && eval "$(pyenv init --path)"

bash/.bashrc

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# Loaded by every interactive bash, and by login bash via ~/.bash_profile.
+# Source env first (idempotent — covers non-login interactive shells that bash
+# would otherwise start without it), then the real interactive config.
+[ -r ~/.profile ] && . ~/.profile
+[ -r ~/.config/bash/rc ] && . ~/.config/bash/rc

bash/.config/bash/rc

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 # Mostly copied from: https://github.com/mathiasbynens/dotfiles/
 
+# Shared interactive config (aliases, functions, pyenv shims):
+[ -r ~/.config/shell/interactive ] && source ~/.config/shell/interactive
+
 # Bash-specific:
 [ -f ~/.config/bash/prompt ] && source ~/.config/bash/prompt
 

shell/.config/shell/exports

@@ -24,8 +24,14 @@ export PYTHONSTARTUP="${XDG_CONFIG_HOME:-$HOME/.config}/python/startup"
 # Custom Python history file
 export PYTHON_HISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/python/history"
 
+# Pyenv root:
+[ -x "$(command -v pyenv)" ] && export PYENV_ROOT="$HOME/.pyenv"
+
 # PostgreSQL config file
-export PSQLRC="${XDG_CONFIG_HOME:-$HOME/.config}/psql/rc"
+[ -x "$(command -v psql)" ] && export PSQLRC="${XDG_CONFIG_HOME:-$HOME/.config}/psql/rc"
 
 # Wget config file
 export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/rc"
+
+# NOTE: ZDOTDIR lives in ~/.zshenv, not here. It must be set before zsh reads
+# any rc file, and this file is sourced too late for that.

shell/.config/shell/interactive

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Shared interactive shell config. Sourced by both zsh ($ZDOTDIR/.zshrc) and
+# bash (~/.config/bash/rc). Only ever loaded by zsh/bash, so brace expansion is
+# fine here (unlike the POSIX `profile`).
+for _file in "${XDG_CONFIG_HOME:-$HOME/.config}"/shell/{aliases,functions,extra}; do
+	[ -r "$_file" ] && . "$_file"
+done
+unset _file
+
+# pyenv interactive shims (pyenv init - autodetects the running shell):
+command -v pyenv >/dev/null 2>&1 && eval "$(pyenv init -)"

shell/.config/shell/path

@@ -1,4 +1,8 @@
 #!/bin/sh
 
-# Adds `~/.local/bin` to $PATH
-export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}"
+# Prepend ~/.local/bin to $PATH (POSIX, idempotent — safe to source twice).
+case ":$PATH:" in
+	*":$HOME/.local/bin:"*) ;;
+	*) [ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH" ;;
+esac
+export PATH

shell/.config/shell/profile

@@ -1,11 +1,13 @@
 #!/bin/sh
 
-# Load the shell dotfiles, and then some:
-# * ~/.path can be used to extend `$PATH`.
-# * ~/.extra can be used for other settings you don’t want to commit.
-for file in ~/.config/shell/{path,exports,aliases,functions,extra}; do
-        [ -r "$file" ] && [ -f "$file" ] && source "$file";
-done;
-unset file;
-
-source ~/.config/bash/rc
+# POSIX login environment. Sourced directly by a /bin/sh login (display
+# managers, plain sh) and indirectly by bash via ~/.bashrc. Env only — no
+# brace expansion (dash doesn't expand it), no shell-specific rc.
+#
+# Interactive config (aliases, functions, prompt) is loaded by each shell's
+# own rc via ~/.config/shell/interactive, not here.
+for _name in path exports; do
+	_file="${XDG_CONFIG_HOME:-$HOME/.config}/shell/$_name"
+	[ -r "$_file" ] && . "$_file"
+done
+unset _name _file

zsh/.config/zsh/.zprofile

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# zsh login shell only. PATH-level init that belongs to login (pyenv shims dir).
+# PYENV_ROOT is exported earlier in ~/.config/shell/exports.
+command -v pyenv >/dev/null 2>&1 && eval "$(pyenv init --path)"

zsh/.config/zsh/.zshrc

@@ -0,0 +1,75 @@
+# Luke's config for the Zoomer Shell
+# Source (mainly): https://github.com/LukeSmithxyz/voidrice/
+
+# Shared interactive config (aliases, functions, pyenv shims):
+[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/shell/interactive" ] && \
+	. "${XDG_CONFIG_HOME:-$HOME/.config}/shell/interactive"
+
+# Enable colors and change prompt:
+autoload -U colors && colors	# Load colors
+PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
+setopt autocd		# Automatically cd into typed directory.
+stty stop undef		# Disable ctrl-s to freeze terminal.
+setopt interactive_comments
+
+# History in cache directory:
+HISTSIZE=10000000
+SAVEHIST=10000000
+
+# Basic auto/tab complete:
+autoload -U compinit
+zstyle ':completion:*' menu select
+zmodload zsh/complist
+compinit
+_comp_options+=(globdots)		# Include hidden files.
+
+# vi mode
+bindkey -v
+export KEYTIMEOUT=1
+
+# Use vim keys in tab complete menu:
+bindkey -M menuselect 'h' vi-backward-char
+bindkey -M menuselect 'k' vi-up-line-or-history
+bindkey -M menuselect 'l' vi-forward-char
+bindkey -M menuselect 'j' vi-down-line-or-history
+bindkey -v '^?' backward-delete-char
+
+# Change cursor shape for different vi modes.
+function zle-keymap-select () {
+    case $KEYMAP in
+        vicmd) echo -ne '\e[1 q';;      # block
+        viins|main) echo -ne '\e[5 q';; # beam
+    esac
+}
+zle -N zle-keymap-select
+zle-line-init() {
+    zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere)
+    echo -ne "\e[5 q"
+}
+zle -N zle-line-init
+echo -ne '\e[5 q' # Use beam shape cursor on startup.
+preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt.
+
+bindkey -s '^a' 'bc -lq\n'
+
+bindkey -s '^f' 'cd "$(dirname "$(fzf)")"\n'
+
+bindkey '^[[P' delete-char
+
+# Edit line in vim with ctrl-e:
+autoload edit-command-line; zle -N edit-command-line
+bindkey '^e' edit-command-line
+
+
+# Custom
+# Activate history search based upon what has already been entered at the prompt,
+# and always put cursor at the end of the line:
+autoload -U history-search-end
+zle -N history-beginning-search-backward-end history-search-end
+zle -N history-beginning-search-forward-end history-search-end
+bindkey "^[[A" history-beginning-search-backward-end
+bindkey "^[[B" history-beginning-search-forward-end
+
+
+# Load syntax highlighting; should be last.
+source /usr/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh 2>/dev/null

zsh/.zshenv

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Read first by zsh for EVERY shell (login or not), so this is the only place
+# ZDOTDIR can be set early enough to redirect where zsh looks for its rc files.
+export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
+# Shared POSIX environment (idempotent):
+for _name in path exports; do
+	_file="$XDG_CONFIG_HOME/shell/$_name"
+	[ -r "$_file" ] && . "$_file"
+done
+unset _name _file