refactor: simplify home-manager layout and fix terminal option drift#79
Merged
Conversation
Fold home/home.nix into modules/default.nix and import ./modules directly from the flake, dropping the modulesDir indirection. Make the terminal choice a single value passed from flake.nix to both the nix-darwin (homebrew cask) and home-manager (program config) trees. Previously terminal.use was declared as two independent options that could silently diverge and install the wrong cask. Also: - deduplicate the catppuccin flavor into one global setting - move dev toolchains (bun, cargo, fnm, go, rustc, rust-analyzer) to home.packages - standardize module entry files to default.nix - enable nix.optimise.automatic - replace hand-written starship version overrides with the no-runtime-versions preset - fix CLAUDE.md/README hostname-vs-username drift and add a structure diagram
derangga
force-pushed
the
refactor/home-config-cleanup
branch
from
July 9, 2026 13:56
cbb5be1 to
71f77f5
Compare
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.
Summary
Cleanup pass over the nix-darwin config: one latent bug fix plus several structural simplifications. No behavior change on the current host beyond the intended ones.
Changes
Bug fix (terminal option drift)
terminal.usewas declared as an option in two independent module trees: nix-darwin (picks the Homebrew cask) and home-manager (picks the program config). Setting it on one side did not affect the other, so switching terminals could install the wrong cask. It is now a singleterminalvalue set per host inflake.nixand passed to both sides.modules/terminal/options.nixdeleted.Layout
home/home.nixintomodules/default.nix; the flake imports./modulesdirectly and no longer threadsmodulesDirthroughextraSpecialArgs.home/removed.config.nixtodefault.nix(aerospace, catppuccin, git, presenterm); imports now reference bare directories. sketchybar/nixvim untouched.Simplification
cfgbinding.bun,cargo,fnm,go,rustc,rust-analyzer) fromenvironment.systemPackagestohome.packages.no-runtime-versionspreset. File renamednosymbol.nixtono-version.nix.nix.optimise.automatic.Docs
terminalfield.