alexion/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: apply the namespace edits dropped from the task 0031 merge #24

Merged
alexion merged 2 commits from fix-0031-namespace-staging into main 2026-07-23 21:47:44 -04:00
Conversation 0 Commits 2 Files Changed 8 +23 -17
alexion commented 2026-07-23 21:45:45 -04:00
Owner
Copy Link

Follow-up to #23. That merge moved the module files but a mis-staged git add (aborted on the already-deleted example.nix pathspec) left the option-path rewrites out of the commit. As a result main declared the old namespaces (modules.claude-code, modules.gitea-axi, modules.pi, modules.desktop.hyprlock/hypridle) while CONTEXT.md and ADR 0004 already documented the new ones — internally consistent, so it built green, but not the change the task specified.

This applies the dropped edits: the option paths in the moved and in-place modules, the neogaia host, and the two live CLAUDE.md gotchas.

Verified on a clean committed tree (not a dirty one this time): nix flake check builds checks.x86_64-linux.neogaia green; the five new paths (modules.agents.claude-code, modules.agents.pi, modules.agents.tools.gitea-axi, modules.desktop.hyprland.hypridle, modules.desktop.hyprland.hyprlock) resolve, and the old paths plus modules.agents.enable no longer resolve.

— Claude

Follow-up to #23. That merge moved the module files but a mis-staged `git add` (aborted on the already-deleted `example.nix` pathspec) left the option-path rewrites out of the commit. As a result `main` declared the **old** namespaces (`modules.claude-code`, `modules.gitea-axi`, `modules.pi`, `modules.desktop.hyprlock`/`hypridle`) while `CONTEXT.md` and ADR 0004 already documented the new ones — internally consistent, so it built green, but not the change the task specified. This applies the dropped edits: the option paths in the moved and in-place modules, the `neogaia` host, and the two live `CLAUDE.md` gotchas. Verified on a clean committed tree (not a dirty one this time): `nix flake check` builds `checks.x86_64-linux.neogaia` green; the five new paths (`modules.agents.claude-code`, `modules.agents.pi`, `modules.agents.tools.gitea-axi`, `modules.desktop.hyprland.hypridle`, `modules.desktop.hyprland.hyprlock`) resolve, and the old paths plus `modules.agents.enable` no longer resolve. — Claude
alexion added 1 commit 2026-07-23 21:45:45 -04:00
fix: apply the namespace edits dropped from the task 0031 merge 6f6f0178b1 
The task 0031 commit moved the module files but a mis-staged `git add`
left the option-path rewrites out, so main declared the old namespaces
(`modules.claude-code`, `modules.gitea-axi`, `modules.pi`,
`modules.desktop.hyprlock`/`hypridle`) while CONTEXT.md and ADR 0004
already documented the new ones. Rewrite the paths in the moved and
in-place modules, the neogaia host, and the two live CLAUDE.md gotchas
so the code matches the recorded convention.
alexion added 1 commit 2026-07-23 21:47:23 -04:00
docs: record the git-add and dirty-tree gotchas behind the task 0031 miss 039802b9e2
alexion merged commit 039802b9e2 into main 2026-07-23 21:47:44 -04:00
alexion deleted branch fix-0031-namespace-staging 2026-07-23 21:47:44 -04:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
alexion
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: alexion/dotfiles#24
Delete Branch "fix-0031-namespace-staging"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?