Skip to content

chore(config): trim comments across the tracked configs - #11

Merged
ptaranat merged 1 commit into
mainfrom
chore/trim-config-comments
Sep 22, 2026
Merged

ptaranat merged 1 commit into
mainfrom
chore/trim-config-comments

Conversation

@ptaranat

Copy link
Copy Markdown
Owner

fix(brew): drop deprecated homebrew/services tap

Homebrew deprecated and emptied this tap, so tapping it is now a hard
error and brew bundle fails outright:

Error: homebrew/services was deprecated. This tap is now empty

brew services moved into brew core, so nothing is lost by removing it.
This broke run_onchange_after_10-packages.sh on every apply.

chore(config): trim comments and reconcile drift

Cut prose comments across 19 files, keeping a one-line reason wherever
the 'why' was not obvious from the code. 736 -> 374 comment lines.

Largest reduction is aerospace.toml (147 -> 14): almost all of it was
upstream template boilerplate, including the 'All possible keys'
reference block and 52 commented-out alt-a..alt-z bindings.

Kept as one-liners: the brew --no-upgrade incident, the Ghostty pgrep
truncation, the Helium single-instance handoff, /etc/zshrc clobbering
history settings, and the p10k instant-prompt ordering constraint.

Also folds two local-only changes back into the source, which had
drifted because the tools write to deployed files directly:

  • mise lua 5.4 (installed for luarocks)
  • .gitconfig gh auth credential helper blocks

The tmux truecolor config was the third such drift, but it turned out
to already exist on fix/tmux-truecolor, so this branch is rebased onto
that one and only retrims its comments.

No functional lines changed beyond those two merges.

ptaranat commented Jul 29, 2026

Copy link
Copy Markdown
Owner Author

@ptaranat ptaranat changed the title fix(brew): drop deprecated homebrew/services tap chore(config): trim comments, reconcile drift, drop deprecated brew tap Jul 29, 2026
@ptaranat
ptaranat changed the base branch from fix/tmux-truecolor to main September 22, 2026 15:40
@ptaranat

Copy link
Copy Markdown
Owner Author

This PR is mid-rework. The large diff below is expected and not what is being proposed.

This branch was cut before main was rewritten, so it still sits on the pre-template lineage. Retargeting its base to main makes GitHub compare across that rewrite, which is why it currently shows ~67 files. Its real content is three commits.

Two of them have been extracted and rebased onto the current main:

The third, c2fc148 (trim comments and reconcile drift, 19 files), cannot be ported as a patch: upstream independently rewrote most of the prose it edits, so the patch would revert comments main deliberately added. The intent still stands, so this PR stays open and gets re-scoped to a fresh comment pass against the current upstream text.

Nothing here is lost. The original branch tip is tagged locally as backup/pre-rework/chore/trim-config-comments at 41c02e9.

@ptaranat
ptaranat force-pushed the chore/trim-config-comments branch from 41c02e9 to 5b42842 Compare September 22, 2026 16:26
@ptaranat ptaranat changed the title chore(config): trim comments, reconcile drift, drop deprecated brew tap chore(config): trim comments across the tracked configs Sep 22, 2026
@ptaranat

Copy link
Copy Markdown
Owner Author

Reworked onto the current main. This is now 23 files, +337/-876, down from the 67-file diff that came from comparing across the history rewrite.

The original commit could not be ported as a patch, since main independently rewrote most of the prose it edited. This is a fresh pass over the current text, in the same style: cut the prose, keep a one-line reason wherever the "why" is not obvious from the code. 970 -> 437 comment lines (54%).

Biggest single reduction is aerospace.toml, 147 -> 16, almost all upstream template boilerplate: the "All possible keys" reference block, the per-setting "Possible values" notes, and 52 commented-out alt-a..alt-z bindings.

Kept as one-liners: the Ghostty pgrep truncation, the Helium single-instance handoff, /etc/zshrc clobbering history settings, the p10k instant-prompt ordering constraint, the brew bundle --no-upgrade incident and its apt counterpart, the mise-before-Homebrew PATH ordering, and the cmadd note about chezmoi add flattening templates.

Two things dropped that are not prose, worth a look:

  • # Status on top sat above set-option -g status-position bottom. It said the opposite of what the line does.
  • Four commented-out status-left/right lines in .tmux.conf were dead config rather than explanation.

Also rewrote one comment in 11-packages-linux.sh.tmpl that used a phrase you have asked me to avoid; the meaning is unchanged.

No functional line changed. Verified per file by diffing every non-comment, non-blank line against origin/main, and separately by rendering each template and parsing the result: zsh -n, sh -n, tomllib, and loading .tmux.conf on a scratch tmux socket.

Merge note: this touches dot_zshenv.tmpl, 01-environment.zsh.tmpl, dot_tmux.conf and .chezmoidata.yaml, which #8, #9 and #10 also change. Whichever lands second needs a small rebase.

Cut prose comments across 23 files, keeping a one-line reason wherever the
"why" was not obvious from the code. 970 -> 437 comment lines.

Largest reduction is aerospace.toml (147 -> 16): almost all of it was upstream
template boilerplate, including the "All possible keys" reference block, the
per-setting "Possible values" notes and 52 commented-out alt-a..alt-z bindings.

Kept as one-liners: the Ghostty pgrep truncation, the Helium single-instance
handoff, /etc/zshrc clobbering the history settings, the p10k instant-prompt
ordering constraint, the brew bundle --no-upgrade incident and its apt
counterpart, the mise-before-Homebrew PATH ordering, and the cmadd note about
`chezmoi add` flattening templates.

Also dropped, as distinct from prose:

  - four commented-out status-bar lines in .tmux.conf, dead config rather
    than explanation
  - "# Status on top" above `set-option -g status-position bottom`, which
    said the opposite of what the line does
  - headers that restated the line beneath them ("# Mouse mode" above
    `set -g mouse on`, "# Make folder then cd" above mcd)

Section dividers are kept in the longer files, where they are the only
navigation.

No functional line changed. Verified per file by diffing every non-comment,
non-blank line against origin/main, and separately by rendering each template
and parsing the result: zsh -n for the shell files, sh -n for the scripts,
tomllib for the TOML, and loading .tmux.conf on a scratch tmux socket.
@ptaranat
ptaranat force-pushed the chore/trim-config-comments branch from 5b42842 to 4ca3da9 Compare September 22, 2026 16:33
@ptaranat
ptaranat merged commit db8d265 into main Sep 22, 2026
@ptaranat
ptaranat deleted the chore/trim-config-comments branch September 22, 2026 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant