feat: split zshrc into a stub and role-aware fragments
Load order is the substance of this change, and two attempts got it wrong in
the same way. oh-my-zsh consumes both the plugins array and the theme while it
is being sourced, so anything set afterwards is silently ignored. The plan had
plugins in the stub but the theme in the role file, which produced a shell
reporting ZSH_THEME=powerlevel10k while running without powerlevel10k at all -
132 of its functions missing and nobody any the wiser. Plugins and prompt are
now both resolved before oh-my-zsh, the latter in 05-prompt.zsh.
Portability is handled by asking whether a command exists rather than by
duplicating files per role. "alias ls='lsd'" turns ls into a broken command on
a machine without lsd, and the Mac is such a machine; the yay aliases and
helpers are gated the same way. That keeps one shared base instead of three
diverging copies.
The plan also guessed the plugin list as (git fzf). It is actually seven
entries, so five would have vanished - among them signal-keyring, which turned
out to be a local custom plugin present on this machine only. Naming it
elsewhere means an oh-my-zsh warning at every login, and its content is a
verbatim copy of the gnome-keyring block already in .zshrc, so it ran twice.
The inline block stays, in the desktop role; the plugin is dropped.
Dead code removed rather than carried over:
- PYTHONPATH pointed at /usr/lib/python3.9/site-packages. Python here is
3.14 and that directory does not exist.
- XDG_SESSION_TYPE was forced to x11 and then tested for "wayland" six lines
below, so that branch could never be taken. The variable belongs to the
session; overriding it lies to everything that reads it.
- drm() was defined twice, the first losing to the second on every start.
- PATH carried ~/bin, ~/.scripts and /usr/X11R6/bin, none of which exist.
Entries are added only if the directory is there.
Verified against the live configuration in an isolated ZDOTDIR: 277 aliases and
263 functions on both sides, none missing, and powerlevel10k loading for all
three roles with the intended colour.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
thomas.kopp
co-authored by
Claude Opus 5
Claude Opus 5
parent
49357eced4
commit
ce560c315d
@@ -0,0 +1,32 @@
|
||||
# Prompt. Sourced by the stub BEFORE oh-my-zsh, and that placement is the whole
|
||||
# point of the file.
|
||||
#
|
||||
# oh-my-zsh loads the theme while it is being sourced, and powerlevel10k reads
|
||||
# its POWERLEVEL9K_* settings when it loads. Anything set afterwards is simply
|
||||
# ignored - the first attempt put ZSH_THEME in the role file, which is sourced
|
||||
# after oh-my-zsh, and the result was a shell with no powerlevel10k at all
|
||||
# while still reporting the right value in ZSH_THEME.
|
||||
|
||||
# Only claim the theme if it is actually installed, otherwise oh-my-zsh falls
|
||||
# back to robbyrussell with a complaint.
|
||||
if [[ -d "${ZSH_CUSTOM:-$ZSH/custom}/themes/powerlevel10k" ]]; then
|
||||
ZSH_THEME="powerlevel10k/powerlevel10k"
|
||||
fi
|
||||
|
||||
# Colour by role. Not decoration: shron carries mail, web and cloud, and a
|
||||
# glance at the prompt should be enough to know which machine the next command
|
||||
# is about to hit. Same segments everywhere so nothing else has to be relearned.
|
||||
case "$ROLE" in
|
||||
server)
|
||||
typeset -g POWERLEVEL9K_CONTEXT_BACKGROUND=red
|
||||
# Show the host even locally. Noise on a desktop, the one thing worth
|
||||
# always seeing here.
|
||||
typeset -g POWERLEVEL9K_ALWAYS_SHOW_CONTEXT=true
|
||||
;;
|
||||
mobile)
|
||||
typeset -g POWERLEVEL9K_CONTEXT_BACKGROUND=green
|
||||
;;
|
||||
*)
|
||||
typeset -g POWERLEVEL9K_CONTEXT_BACKGROUND=blue
|
||||
;;
|
||||
esac
|
||||
@@ -0,0 +1,25 @@
|
||||
# Aliases shared by every machine.
|
||||
#
|
||||
# Each one that depends on a command is guarded by whether that command exists.
|
||||
# Without the guard, "alias ls='lsd'" turns ls into a broken command on any
|
||||
# machine where lsd is not installed - the Mac, for one - and breaking ls is
|
||||
# the sort of thing that makes a shared dotfile repository feel like a mistake.
|
||||
|
||||
alias vi="nvim"
|
||||
alias ducks="du -cksh * | sort -rn | head"
|
||||
|
||||
if (( $+commands[lsd] )); then
|
||||
alias ls='lsd'
|
||||
alias l='lsd -l'
|
||||
alias la='lsd -a'
|
||||
alias lla='lsd -la'
|
||||
alias lt='lsd --tree'
|
||||
fi
|
||||
|
||||
# Arch only. Present on beastix and shron, absent on the Mac.
|
||||
(( $+commands[yay] )) && \
|
||||
alias update='yay -Syu --devel --noconfirm --diffmenu=false --cleanmenu=false --editmenu=false --answerupgrade None'
|
||||
|
||||
# kitty's ssh wrapper, which carries the terminfo across. Falls back to nothing
|
||||
# rather than shadowing ssh with something that is not there.
|
||||
(( $+commands[kitten] )) && alias s="kitten ssh"
|
||||
@@ -0,0 +1,176 @@
|
||||
# Functions shared by every machine.
|
||||
#
|
||||
# The fzf-based ones are the bulk of it. They are defined unconditionally: a
|
||||
# function that is never called costs nothing, and guarding each one would be
|
||||
# more noise than the guard is worth. Only the docker group is gated, because
|
||||
# those names are short enough to shadow something else on a machine without
|
||||
# docker.
|
||||
|
||||
# Which hosts are holding the most connections open.
|
||||
detect-ddos() {
|
||||
sudo netstat -ntu | awk '{print $5}' | cut -d: -f1 | sort | uniq -c | sort -n
|
||||
}
|
||||
|
||||
# cd into a directory picked with fzf.
|
||||
fdir() {
|
||||
local dir
|
||||
dir=$(find "${1:-.}" -path '*/\.*' -prune \
|
||||
-o -type d -print 2> /dev/null | fzf +m) &&
|
||||
cd "$dir"
|
||||
}
|
||||
|
||||
# Pick a command out of history and put it on the command line rather than
|
||||
# running it, so it can still be edited.
|
||||
fhist() {
|
||||
print -z $( ([ -n "$ZSH_NAME" ] && fc -l 1 || history) | fzf +s --tac | sed -E 's/ *[0-9]*\*? *//' | sed -E 's/\\/\\\\/g')
|
||||
}
|
||||
|
||||
# Kill a process picked with fzf. Non-root sees only its own processes, which
|
||||
# is also all it could kill.
|
||||
fkill() {
|
||||
local pid
|
||||
if [ "$UID" != "0" ]; then
|
||||
pid=$(ps -f -u "$UID" | sed 1d | fzf -m | awk '{print $2}')
|
||||
else
|
||||
pid=$(ps -ef | sed 1d | fzf -m | awk '{print $2}')
|
||||
fi
|
||||
|
||||
if [ "x$pid" != "x" ]; then
|
||||
echo "$pid" | xargs kill -"${1:-9}"
|
||||
fi
|
||||
}
|
||||
|
||||
# Kill tmux sessions picked with fzf. Needs zsh's =~ operator.
|
||||
tmuxkillf () {
|
||||
local sessions
|
||||
sessions="$(tmux ls|fzf --exit-0 --multi)" || return $?
|
||||
local i
|
||||
for i in "${(f@)sessions}"
|
||||
do
|
||||
[[ $i =~ '([^:]*):.*' ]] && {
|
||||
echo "Killing $match[1]"
|
||||
tmux kill-session -t "$match[1]"
|
||||
}
|
||||
done
|
||||
}
|
||||
|
||||
# tm pick a session with fzf
|
||||
# tm <name> attach to it, creating it if needed
|
||||
# Works from inside tmux too, where attaching would fail.
|
||||
tm() {
|
||||
[[ -n "$TMUX" ]] && change="switch-client" || change="attach-session"
|
||||
if [ "$1" ]; then
|
||||
tmux $change -t "$1" 2>/dev/null || (tmux new-session -d -s "$1" && tmux $change -t "$1"); return
|
||||
fi
|
||||
session=$(tmux list-sessions -F "#{session_name}" 2>/dev/null | fzf --exit-0) && tmux $change -t "$session" || echo "No sessions found."
|
||||
}
|
||||
|
||||
# Leave yazi in the directory it was left in, rather than where it started.
|
||||
(( $+commands[yazi] )) && y() {
|
||||
local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
|
||||
yazi "$@" --cwd-file="$tmp"
|
||||
IFS= read -r -d '' cwd < "$tmp"
|
||||
[ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
|
||||
rm -f -- "$tmp"
|
||||
}
|
||||
|
||||
# Docker helpers, all fzf pickers. Present on all three machines today, but
|
||||
# "ds" and "da" are short enough to be worth gating rather than defining blind.
|
||||
if (( $+commands[docker] )); then
|
||||
# start a stopped container and attach to it
|
||||
da() {
|
||||
local cid
|
||||
cid=$(docker ps -a | sed 1d | fzf -1 -q "$1" | awk '{print $1}')
|
||||
[ -n "$cid" ] && docker start "$cid" && docker attach "$cid"
|
||||
}
|
||||
|
||||
# stop a running container
|
||||
ds() {
|
||||
local cid
|
||||
cid=$(docker ps | sed 1d | fzf -q "$1" | awk '{print $1}')
|
||||
[ -n "$cid" ] && docker stop "$cid"
|
||||
}
|
||||
|
||||
# remove containers, multi-select. The single-select version that used to sit
|
||||
# above this one was dead code: it had the same name and was overwritten on
|
||||
# every shell start.
|
||||
drm() {
|
||||
docker ps -a | sed 1d | fzf -q "$1" --no-sort -m --tac | awk '{ print $1 }' | xargs -r docker rm
|
||||
}
|
||||
|
||||
# remove images, multi-select
|
||||
drmi() {
|
||||
docker images | sed 1d | fzf -q "$1" --no-sort -m --tac | awk '{ print $3 }' | xargs -r docker rmi
|
||||
}
|
||||
fi
|
||||
|
||||
# Arch package hygiene: remove orphans, but write down what was removed first
|
||||
# so the decision can be undone.
|
||||
if (( $+commands[yay] )); then
|
||||
yay_remove_orphans() {
|
||||
local backup_dir="$HOME/.config/yay"
|
||||
local date_str backup_file orphans
|
||||
|
||||
date_str="$(date +%Y-%m-%d_%H-%M-%S)"
|
||||
backup_file="$backup_dir/remove_orph_${date_str}.bak"
|
||||
mkdir -p "$backup_dir"
|
||||
|
||||
orphans=("${(@f)$(yay -Qtdq)}")
|
||||
|
||||
if [[ ${#orphans[@]} -eq 0 || -z "${orphans[1]}" ]]; then
|
||||
echo "✔ Keine verwaisten Pakete gefunden."
|
||||
return 0
|
||||
fi
|
||||
|
||||
print -l -- "${orphans[@]}" > "$backup_file"
|
||||
|
||||
echo "📦 Backup der verwaisten Pakete erstellt:"
|
||||
echo " $backup_file"
|
||||
echo
|
||||
echo "🧹 Entferne folgende Pakete:"
|
||||
print -l -- "${orphans[@]}"
|
||||
echo
|
||||
|
||||
yay -Rns "${orphans[@]}"
|
||||
}
|
||||
|
||||
yay_restore_orphans() {
|
||||
local backup_dir="$HOME/.config/yay"
|
||||
local backup_file packages selected
|
||||
|
||||
backup_file=$(ls -1 "$backup_dir"/remove_orph_*.bak 2>/dev/null | fzf \
|
||||
--prompt="Backup auswählen: " \
|
||||
--height=40% \
|
||||
--reverse)
|
||||
|
||||
[[ -z "$backup_file" ]] && {
|
||||
echo "✖ Kein Backup ausgewählt."
|
||||
return 1
|
||||
}
|
||||
|
||||
packages=("${(@f)$(cat "$backup_file")}")
|
||||
|
||||
if [[ ${#packages[@]} -eq 0 ]]; then
|
||||
echo "✖ Backup ist leer."
|
||||
return 1
|
||||
fi
|
||||
|
||||
selected=("${(@f)$(printf "%s\n" "${packages[@]}" | fzf \
|
||||
--multi \
|
||||
--prompt="Pakete auswählen (TAB): " \
|
||||
--height=60% \
|
||||
--reverse)}")
|
||||
|
||||
[[ ${#selected[@]} -eq 0 ]] && {
|
||||
echo "✖ Keine Pakete ausgewählt."
|
||||
return 1
|
||||
}
|
||||
|
||||
echo
|
||||
echo "📦 Installiere folgende Pakete:"
|
||||
printf " - %s\n" "${selected[@]}"
|
||||
echo
|
||||
|
||||
yay -S "${selected[@]}"
|
||||
}
|
||||
fi
|
||||
@@ -0,0 +1,45 @@
|
||||
# PATH and environment shared by every machine.
|
||||
#
|
||||
# Entries are added only if the directory exists. The list this replaces
|
||||
# carried ~/bin, ~/.scripts and /usr/X11R6/bin, none of which are present on
|
||||
# this machine - a PATH full of missing directories costs a stat on every
|
||||
# lookup and hides the fact that something was never installed.
|
||||
#
|
||||
# It also exported PYTHONPATH=/usr/lib/python3.9/site-packages. Python here is
|
||||
# 3.14 and that directory does not exist; pointing PYTHONPATH at a missing
|
||||
# 3.9 tree is at best inert and at worst confusing, so it is gone.
|
||||
|
||||
# $HOME rather than a hardcoded /home/templis: the Mac puts it under /Users.
|
||||
_path_add() {
|
||||
[[ -d "$1" ]] || return 0
|
||||
case ":$PATH:" in
|
||||
*":$1:"*) ;;
|
||||
*) PATH="$1:$PATH" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
_path_add "$HOME/.local/bin" # pipx
|
||||
_path_add "$HOME/perl5/bin" # local::lib
|
||||
_path_add "$HOME/bin"
|
||||
_path_add "$HOME/.scripts"
|
||||
export PATH
|
||||
unfunction _path_add
|
||||
|
||||
# local::lib, only where it is actually set up.
|
||||
if [[ -d "$HOME/perl5/lib/perl5" ]]; then
|
||||
export PERL5LIB="$HOME/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"
|
||||
export PERL_LOCAL_LIB_ROOT="$HOME/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"
|
||||
export PERL_MB_OPT="--install_base \"$HOME/perl5\""
|
||||
export PERL_MM_OPT="INSTALL_BASE=$HOME/perl5"
|
||||
fi
|
||||
|
||||
export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border'
|
||||
|
||||
# ghostty announces itself but its terminfo is not everywhere, which leaves
|
||||
# remote hosts unable to draw anything.
|
||||
if [[ "$TERM_PROGRAM" == "ghostty" ]]; then
|
||||
export TERM=xterm-256color
|
||||
fi
|
||||
|
||||
# powerlevel10k's own configuration, where it exists.
|
||||
[[ ! -f "$HOME/.p10k.zsh" ]] || source "$HOME/.p10k.zsh"
|
||||
@@ -0,0 +1,40 @@
|
||||
# Role: desktop (beastix - Arch, KDE, X11)
|
||||
#
|
||||
# Everything here is either about running a graphical session or about things
|
||||
# only this machine has. None of it belongs on a headless server or a Mac.
|
||||
|
||||
# Qt tries wayland first and falls back to xcb, which covers both session types
|
||||
# without having to know which one is running.
|
||||
export QT_QPA_PLATFORM="wayland;xcb"
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
|
||||
# The previous configuration exported XDG_SESSION_TYPE=x11 and then, six lines
|
||||
# later, tested it for "wayland" to decide whether to enable MOZ_ENABLE_WAYLAND.
|
||||
# That branch could never be taken. XDG_SESSION_TYPE is set by the session
|
||||
# itself and overriding it lies to everything that reads it, so it is left
|
||||
# alone; MOZ_ENABLE_WAYLAND is simply set once, above.
|
||||
|
||||
export MUTTER_DEBUG_KMS_THREAD_TYPE=user
|
||||
|
||||
# Steam prefixes for Path of Exile, used by the trade tooling.
|
||||
export poe2="$HOME/.local/share/Steam/steamapps/compatdata/2694490/pfx/drive_c/users/steamuser/My Documents/My Games/Path of Exile 2/"
|
||||
export poe="$HOME/.local/share/Steam/steamapps/compatdata/238960/pfx/drive_c/users/steamuser/My Documents/My Games/Path of Exile/"
|
||||
|
||||
# Signal needs a secrets service, and KDE does not start gnome-keyring itself.
|
||||
#
|
||||
# This used to exist twice: once here and once as a local custom oh-my-zsh
|
||||
# plugin named signal-keyring, so it ran on every shell start in both places.
|
||||
# The plugin is not in this repository and does not exist on the other two
|
||||
# machines, where naming it in the plugin list produced a warning at every
|
||||
# login. Keeping the inline version and dropping the plugin fixes both.
|
||||
if ! pgrep -f gnome-keyring-daemon >/dev/null; then
|
||||
eval $(gnome-keyring-daemon --start --components=secrets)
|
||||
export $(gnome-keyring-daemon --start --components=secrets | grep ^SSH_AUTH_SOCK)
|
||||
fi
|
||||
|
||||
# Toolchains that only this machine carries.
|
||||
for _d in "$HOME/.cargo/bin" "$HOME/.lmstudio/bin"; do
|
||||
[[ -d "$_d" ]] && case ":$PATH:" in *":$_d:"*) ;; *) PATH="$_d:$PATH" ;; esac
|
||||
done
|
||||
unset _d
|
||||
export PATH
|
||||
@@ -0,0 +1,16 @@
|
||||
# Role: mobile (the Mac - macOS on Apple Silicon)
|
||||
#
|
||||
# Homebrew's shellenv belongs in .zprofile, not here: a non-login shell would
|
||||
# otherwise have no /opt/homebrew/bin in PATH. That is not theory - during the
|
||||
# design phase "ssh mac brew --version" came back empty for exactly that
|
||||
# reason, and was briefly mistaken for Homebrew not being installed.
|
||||
|
||||
# Apple Silicon puts Homebrew under /opt/homebrew; Intel Macs use /usr/local.
|
||||
# Checked rather than assumed, so the same file works on either.
|
||||
for _b in /opt/homebrew /usr/local; do
|
||||
if [[ -x "$_b/bin/brew" ]]; then
|
||||
eval "$("$_b/bin/brew" shellenv)"
|
||||
break
|
||||
fi
|
||||
done
|
||||
unset _b
|
||||
@@ -0,0 +1,6 @@
|
||||
# Role: server (shron - Arch, headless)
|
||||
#
|
||||
# Deliberately thin. A server shell wants to be recognisable and otherwise get
|
||||
# out of the way; anything that assumes a graphical session belongs in
|
||||
# 50-desktop.zsh.
|
||||
|
||||
Reference in New Issue
Block a user