Repository navigation
chore: sync fork with Kun upstream (ancestry-only merge, zero tree diff) - #46
Closed
Jin-HoMLee wants to merge 16 commits into
Closed
Jin-HoMLee wants to merge 16 commits into
Jin-HoMLee wants to merge 16 commits into
Conversation
* feat(home): install github-cli Add gh to home.packages alongside the other everyday CLI tools. * chore(pi): sync agent-persisted settings pi writes lastChangelogVersion, defaultProvider, and defaultModel back into settings.json at runtime via the out-of-store symlink; committing the current state. * chore(gitignore): deny-list herdr runtime dir instead of enumerating files The old rule listed known runtime files one by one (*.log, session.json, *.sock) and missed .plugins.lock, which showed up untracked. Ignore everything under home/.config/herdr/ except the one file we actually track, config.toml, so future runtime files can't sneak through the same way.
Pi (github.com/earendil-works/pi) stays opt-in and npm-installed per the README's existing Pi section - this only adds the node runtime its already-installed shim needs to run, restoring it after homebrew's zap cleanup removed an undeclared node. Also bumps the nix-homebrew input (and its nested brew-src) from a patched Homebrew 6.0.1 to 6.0.18. The old pin threw 'unknown install step: run' on any formula bottle using a newer Homebrew post-install step format, which is what node's own dependency chain hit.
Whisper dictation/transcription app, installed via nix-homebrew since it is not packaged in nixpkgs.
Adds kunchenguid/tap and the baby-menu cask (self-editing menu-bar app: https://github.com/kunchenguid/baby-menu). Also sets onActivation.extraEnv.HOMEBREW_NO_REQUIRE_TAP_TRUST=1: since Homebrew 6.0.0, brew refuses to load casks/formulae from non-official taps until interactively `brew trust`-ed, and that grant doesn't reliably reach the internal `brew cleanup` subprocess spawned by `--force-cleanup` during sudo-driven darwin-rebuild activation. Taps only reach the Brewfile via a reviewed commit to this file, so Homebrew's own interactive re-confirmation on top of that is redundant here.
* feat: install Codex via Homebrew, fix co alias for CLI flag removal Add the codex cask to configuration.nix, matching claude-code as an always-latest agent CLI (rather than pinning via nixpkgs), since both ship weekly-ish and Homebrew's onActivation.autoUpdate keeps them current on every rebuild. Also fix the co alias: --full-auto was removed in Codex CLI v0.147.0 (deprecated since v0.128) in favor of explicit --sandbox and --ask-for-approval flags. Update home.nix and the README reference to match. * docs: also list nodejs in the Nix packages README bullet Caught in code review: the bullet already omitted nodejs, which has been installed via home.nix since commit 028cef0.
… at xhigh thinking Syncs Pi's live default provider/model/thinking-level settings back into the repo.
* feat(home): install Grok CLI from nixpkgs-unstable The x.ai installer left a manual install under ~/.grok, which never lands on PATH. Install grok-build declaratively instead, so `grok` comes from the managed profile. 26.05 has no grok-build, so flake.nix gains a second, narrowly used nixpkgs-unstable input threaded through specialArgs/extraSpecialArgs. home.nix imports it with the same nixpkgs policy as the rest of the config, because grok-build is unfree (`unfreeRedistributable`). Resolves to grok-build 1.0.13, providing `grok` (and the `agent` symlink) in home.packages. * docs(agents): record why grok-build needs the unstable import The unfree package can only come from a nixpkgs instance instantiated with the repo's nixpkgs policy; `legacyPackages` and a `pkgs.extend` overlay both fail the unfree check, which is what a future "simplification" would try.
* fix(pi): prioritize corrected launcher in zsh * fix(homebrew): declare Handy instead of OpenSuperWhisper
…n-upstream # Conflicts: # home/.pi/agent/settings.json
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Thanks for taking an interest in these dotfiles.
This repo is public so you can read it, learn from it, and fork it freely, but it is Kun's personal setup and does not accept pull requests or feature requests.
If you want to adapt something, please fork the repo and make it yours.
If you found a bug, please open a bug report issue instead of sending a patch.
Pull requests are auto-closed here so the repo can stay personal and predictable.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this does
Records the fork's upstream ancestry after PR 10 by merging the configured Kun upstream into this branch as a merge commit.
origin/mainat068f328(contains PR Add WezTerm split pane shortcuts #10).upstream/main(kunchenguid/dotfiles) at9a4a638— Remove the experimental Pi OpenAI server compaction package. (Remove experimental Pi OpenAI server compaction package #37).fda853dwith parents068f328(fork) and9a4a638(upstream).No rebase, no force-push, no squash: the fork's existing commits are untouched.
Why the diff is empty
The single upstream-only commit is already represented in the fork by
040ed56(Remove the experimental Pi OpenAI server compaction package. (#37) (#8)). Merging it therefore adds no substantive tree change.Verified:
git merge-base --is-ancestor upstream/main HEAD→ upstream/main is a recorded ancestor of this branch.git diff origin/main HEAD→ empty; both trees are25496b85.This PR must ultimately be merged with GitHub's "Create a merge commit" method — NOT squash and NOT rebase.
Squashing or rebasing would discard the second parent of
fda853dand lose the recordedupstream/mainancestry this PR exists to establish. The zero-diff content is intentional; the value of this PR is the parentage.Conflict resolution note
home/.pi/agent/settings.jsonconflicted (both sides removed the compaction package pin, but the fork additionally carries locallastChangelogVersion/defaultProvider/defaultModel/defaultThinkingLevelfields). Resolved by keeping the fork's version, per the review decision — upstream's package-list change was already present, and upstream's removal of the local default fields was deliberately not taken. Resolution was verified to be byte-identical toorigin/main, which is why the tree diff above is empty.No Nix rebuild, no live-machine change, and no merge of this PR are performed here.