update zsh config

This commit is contained in:
2026-07-26 23:36:02 +02:00
parent cdf5c6e541
commit 678cfb76ba
19 changed files with 223 additions and 107 deletions
+31 -19
View File
@@ -1,5 +1,9 @@
# Remove the last command from history (both memory and file).
# The alias has a leading space so "oops" itself is not recorded (HIST_IGNORE_SPACE).
#
# NOTE: other shells running concurrently still hold the entry in their own
# in-memory history and can write it back; SHARE_HISTORY does not propagate
# deletions.
uy_oops_confirm() {
# Flush current session to file so we operate on the latest state
fc -W
@@ -9,25 +13,28 @@ uy_oops_confirm() {
return 1
fi
# Read the last entry (may span multiple lines if it ends with \)
local -a entry
local line
while IFS= read -r line; do
entry+=("$line")
# EXTENDED_HISTORY continuation lines end with a literal backslash
[[ "$line" == *'\' ]] || break
done < <(tail -n 50 "$HISTFILE" | tac)
# entry is reversed (last line first), flip it back
# Find where the last entry starts. An entry continues onto the next line
# when the current one ends in a backslash; zsh writes a command that itself
# ends in a backslash as "\ " (trailing space), so the marker is unambiguous.
# Walking forward and remembering the start of each entry is exact for
# entries of any length — scanning backwards over a fixed window is not.
local start
start=$(awk '{ if (!cont) start = NR; cont = /\\$/ } END { print start + 0 }' "$HISTFILE")
if [[ -z "$start" ]] || (( start < 1 )); then
print -P "%F{yellow}Could not parse last history entry.%f"
return 1
fi
local -a ordered
for (( i=${#entry[@]}; i>=1; i-- )); do
ordered+=("${entry[$i]}")
done
ordered=("${(@f)$(tail -n +"$start" "$HISTFILE")}")
if (( ${#ordered[@]} == 0 )); then
print -P "%F{yellow}Could not parse last history entry.%f"
return 1
fi
local line
print -P "About to permanently delete the last command from history:"
for line in "${ordered[@]}"; do
print -P " %F{red}${line}%f"
@@ -38,17 +45,22 @@ uy_oops_confirm() {
read -r reply
if [[ -z "$reply" || "$reply" == [yY]* ]]; then
# Delete the last N lines (the full entry) from the file
# Keep everything before the entry. start-1 == 0 (the entry is the only
# one) correctly leaves an empty file.
local n=${#ordered[@]}
head -n -"$n" "$HISTFILE" > "$HISTFILE.tmp" && mv "$HISTFILE.tmp" "$HISTFILE"
# Reload history from the updated file
fc -R
head -n $(( start - 1 )) "$HISTFILE" > "$HISTFILE.tmp" && mv "$HISTFILE.tmp" "$HISTFILE"
# Replace the in-memory history with the updated file.
# `fc -R` would *append* the file on top of what is already in memory,
# which both duplicates every entry and leaves the deleted command in
# memory — the next `fc -W` (e.g. the one at the top of this function
# on a second `oops`) would then write it straight back to the file.
fc -p "$HISTFILE" $HISTSIZE $SAVEHIST
print -P "%F{green}Deleted ($n line(s) removed).%f"
else
# Reload anyway to stay in sync
fc -R
# Nothing was modified, so there is nothing to reload.
print -P "%F{yellow}Cancelled.%f"
fi
}
# The alias has a leading space so "oops" itself is not recorded (HIST_IGNORE_SPACE).
alias oops=' uy_oops_confirm'