Skip to content

Do some restructuring and cleanup#606

Merged
genebean merged 3 commits intomainfrom
rainbow-rework
Mar 22, 2026
Merged

Do some restructuring and cleanup#606
genebean merged 3 commits intomainfrom
rainbow-rework

Conversation

@genebean
Copy link
Copy Markdown
Owner

@genebean genebean commented Mar 14, 2026

Per Claude's analysis of the git patch...

Summary of Changes

Scope Change Functional?
All HM users nh flake path fixed (/Users/ → homeDirectory) ✅ Yes — bug fix for Linux
All HM users deadnix, statix, nixfmt-tree packages added ✅ Yes — new packages
nixnuc http_port let-binding removed (was unused) No
nixnuc pipewire/pulseaudio moved inside services {} No (NixOS merges)
nixnuc virtualisation repeated keys merged No
hetznix01/02 inputs arg removed (unused) No
kiosk-entryway, kiosk-gene-desk final → _final in overlay No
nixnas1 disk-config.nix wrapper removed No
nixpkgs-settings.nix inputs arg removed (unused) No
All modules/hosts/common → modules/shared + path updates No
All nixfmt reformatting throughout No
All CI, pre-commit, README added No
flake.nix Dead linuxHomeConfig function removed No
2024-12-rework/ Deleted No

The two real changes to be aware of before merging:

  1. The nh path fix (/Users/${username}${config.home.homeDirectory}) is a genuine bug fix that will make the nh tool work correctly on Linux for the first time. It was broken before on all Linux hosts.
  2. Three new packages (deadnix, statix, nixfmt-tree) will be added to the Home Manager packages for every managed user on every host.

@genebean genebean force-pushed the rainbow-rework branch 6 times, most recently from 072aef7 to 9b3c078 Compare March 21, 2026 02:30
- Delete 2024-12-rework/ folder
- Rename modules/hosts/common to modules/shared, then split into:
  - modules/shared/home/general
  - modules/shared/home/linux
  - modules/shared/nixos
- Update all import paths throughout the codebase
- Update lib/*.nix to use new paths
- Fix hardcoded /Users/${username} to use config.home.homeDirectory
- Update README and examples/flake-structure.nix
- Add deadnix, nixfmt, and statix to flake inputs
- Add formatter output to flake for nix fmt support
- Add deadnix, nixfmt, statix to Home Manager packages
- Add GitHub Actions workflow for CI validation
- Add .pre-commit-config.yaml with hooks for nixfmt, deadnix, and statix
- Support x86_64-darwin in formatter
@genebean genebean marked this pull request as ready for review March 22, 2026 23:05
@genebean genebean merged commit e645668 into main Mar 22, 2026
3 checks passed
@genebean genebean deleted the rainbow-rework branch March 22, 2026 23:05
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