Skip to content

targets/darwin/terminfo: compose TERMINFO_DIRS - #9862

Open
khaneliman wants to merge 1 commit into
session-vars-4-append-optionfrom
session-vars-5-darwin-terminfo
Open

khaneliman wants to merge 1 commit into
session-vars-4-append-optionfrom
session-vars-5-darwin-terminfo

Conversation

@khaneliman

@khaneliman khaneliman commented Aug 28, 2026 •

Copy link
Copy Markdown
Collaborator

Description

Builds Darwin's TERMINFO_DIRS from home.sessionSearchVariables plus the new append option instead of one self-referential home.sessionVariables value.

On the first merge, Home Manager's terminfo directory comes first and /usr/share/terminfo comes last. Inherited directories remain between them, and configured entries are not duplicated. Later merges preserve the positions of configured entries already present in TERMINFO_DIRS.

Adds targets.darwin.terminfo.enable. The 2026-04-20 news entry told users to opt out by overriding home.sessionVariables.TERMINFO_DIRS. That value now composes with the module's paths instead of disabling them, so the new news entry points to the explicit option.

Part of splitting #9735 into independently reviewable changes. The stack as a whole supersedes that PR.

Verification

  • nix build path:.#test-all
  • focused session-variable and news tests
  • nix fmt -- --ci
  • HTML manual and manpages
  • aarch64-darwin evaluation for the default, disabled, and user-composed cases

Checklist

  • Change is backwards compatible. (The old home.sessionVariables.TERMINFO_DIRS opt-out now composes with the module paths; news entry included.)
  • Code formatted with nix fmt.
  • Code tested through nix build .#test-all.
  • Test cases updated/added.
  • Commit messages follow the {component}: {description} format.

@khaneliman khaneliman changed the title session vars 5 darwin terminfo targets/darwin/terminfo: compose TERMINFO_DIRS Aug 28, 2026
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch 2 times, most recently from d475d1f to 66023f4 Compare August 28, 2026 19:53
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch 2 times, most recently from 7746326 to b2d5568 Compare August 28, 2026 20:58
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from b2d5568 to 5e6aa03 Compare August 28, 2026 21:04
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from 5e6aa03 to f835d58 Compare August 29, 2026 02:55
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from f835d58 to 3d5556b Compare August 29, 2026 04:20
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch 2 times, most recently from c3c3372 to bdb6986 Compare August 29, 2026 13:30
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from bdb6986 to 218bf80 Compare August 29, 2026 14:26
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from 218bf80 to d5e1fa1 Compare August 30, 2026 03:02
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from d5e1fa1 to d0e61dd Compare August 30, 2026 03:48
@khaneliman
khaneliman marked this pull request as ready for review August 30, 2026 03:50
@home-manager-ci
home-manager-ci Bot requested a review from midchildan August 30, 2026 03:51
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from d0e61dd to 090f097 Compare September 9, 2026 22:13
@khaneliman
khaneliman removed this pull request from stack #9866 September 11, 2026 03:12
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from 090f097 to e478275 Compare September 11, 2026 03:12
@khaneliman
khaneliman added this pull request to stack #9926 September 11, 2026 03:12
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from 511d682 to c577033 Compare September 30, 2026 04:23
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch 2 times, most recently from 2727a6c to b10bf13 Compare October 1, 2026 02:11
Build TERMINFO_DIRS from home.sessionSearchVariables and
home.sessionSearchVariablesAppend instead of a self-referential
home.sessionVariables value.

On the first merge, place Home Manager's directory first and the
system fallback last. Later merges preserve configured entries already
present in TERMINFO_DIRS. Do not add duplicate configured entries.

Add targets.darwin.terminfo.enable as the explicit opt-out. The prior
home.sessionVariables.TERMINFO_DIRS override now composes with the
module's paths instead of disabling them, so document the new opt-out in
news.

Run zsh test commands with -f because zsh reads .zshenv for -c commands.
This prevents host session markers from bypassing test merges.
@khaneliman
khaneliman force-pushed the session-vars-5-darwin-terminfo branch from b10bf13 to dda6403 Compare November 18, 2026 01:13

This branch has not been deployed

No deployments
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