Skip to content

feat(zsh): complete chezmoi edit with managed source files #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurigates merged 2 commits into from
Jul 10, 2026
Merged

feat(zsh): complete chezmoi edit with managed source files #313

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb62298
fix(zsh): sort ghsq/ghrb PR picker oldest-to-newest with cursor on ol…
laurigates Jul 8, 2026
126fb96
feat(zsh): complete `chezmoi edit` with managed source files
laurigates Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions dot_zshrc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,16 +614,18 @@ _gh_batch_merge() {
}

# fzf multi-select over current-repo PRs → TSV "<tab>num<tab>title" lines for
# the batch engine (empty repo field = current repo). $1 = header verb;
# remaining args = extra fzf flags (e.g. --tac to reverse the list order).
# the batch engine (empty repo field = current repo). List is sorted oldest→
# newest (safer bet for clean rebase/squash order); $1 = header verb; remaining
# args = extra fzf flags (callers pass --layout=reverse so the cursor starts
# on the oldest PR, at the top, matching the sort direction).
_gh_pr_multi_select() {
local verb="$1"; shift
local -a fzf_extra=("$@")
local repo
repo=$(gh repo view --json nameWithOwner -q .nameWithOwner 2>/dev/null)
gh pr list --limit 100 \
--json number,title,headRefName,isDraft,statusCheckRollup,reviewDecision \
--jq '.[] | [
--json number,title,headRefName,isDraft,statusCheckRollup,reviewDecision,createdAt \
--jq 'sort_by(.createdAt) | .[] | [
"#\(.number)",
(if .isDraft then "draft" else "ready" end),
(if (.statusCheckRollup | length) == 0 then "⏳CI"
Expand Down Expand Up @@ -655,7 +657,7 @@ _gh_pr_multi_select() {
# via completion) merges that single PR directly.
ghsq() {
if [[ $# -eq 0 ]]; then
local tsv; tsv=$(_gh_pr_multi_select squash --tac)
local tsv; tsv=$(_gh_pr_multi_select squash --layout=reverse)
[[ -n "$tsv" ]] && _gh_batch_merge "$tsv" --squash --delete-branch
else
gh pr merge "${1%%\[*}" --squash --delete-branch
Expand All @@ -665,7 +667,7 @@ ghsq() {
# Interactive PR merge (rebase) — multi-select twin of ghsq.
ghrb() {
if [[ $# -eq 0 ]]; then
local tsv; tsv=$(_gh_pr_multi_select rebase --tac)
local tsv; tsv=$(_gh_pr_multi_select rebase --layout=reverse)
[[ -n "$tsv" ]] && _gh_batch_merge "$tsv" --rebase --delete-branch
else
gh pr merge "${1%%\[*}" --rebase --delete-branch
Expand Down Expand Up @@ -1011,6 +1013,22 @@ autoload -Uz compinit && compinit
# Note: Completion definitions must be loaded AFTER compinit to ensure
# they are properly registered with the zsh completion system

# Custom completion for `chezmoi edit`: offer managed target files.
# chezmoi's own cobra completion returns nothing for `edit`, so it falls
# back to completing the entire filesystem. Restrict it to files/symlinks
# that actually exist in the source directory (via `chezmoi managed`).
# All other subcommands defer to the real _chezmoi completion.
_chezmoi_edit_managed() {
if [[ ${words[2]} == edit && ${words[CURRENT]} != -* ]]; then
local -a managed
managed=("${(@f)$(command chezmoi managed --path-style=absolute --include=files,symlinks 2>/dev/null)}")
compadd -f -- "${managed[@]}"
return
fi
_chezmoi "$@"
}
compdef _chezmoi_edit_managed chezmoi

# Custom completion for gh PR merge wrappers (ghsq, ghrb)
# Lists open PRs with fzf-tab preview of PR details
_gh_pr_merge_complete() {
Expand Down
Loading