Fold dotfiles-nixos into this repository #1

alexion · 2026-07-19T08:12:38-04:00

alexion commented

2026-07-19 08:12:38 -04:00

Folds the separate dotfiles-nixos repository into this one, so a single repo owns machine configuration instead of two serving the same purpose.

What this does

The 28 commits from dotfiles-nixos are rebased on top of this repo's main, followed by one commit removing the pre-NixOS tree.
The branch tip is byte-identical to dotfiles-nixos@main — verified with git diff, which is empty.

89 commits ─┬─ 60  existing dotfiles history (unchanged)
            ├─ 28  nixos work, replayed on top
            └─  1  removal of the old tree

The two repositories turned out to be almost perfectly disjoint: exactly one tracked path collided (.gitignore), resolved as the union during the rebase and then reset to the flake's own version, since the dotfiles-era entries no longer describe anything in the tree.

What was removed, and why it is safe

The removal commit deletes 88 files: .config/, .gitconfig, .github/, and the repo-local .claude/.
Every one remains reachable in history for reference while the migration finishes.

The .claude/ deletions are worth calling out specifically, because they are superseded rather than dropped.
modules/claude-code/claude-code.nix already carries all 14 skills via skills = ./skills, plus gitea-axi which the old copy lacked, and installs hooks/attention-bell.sh through builtins.readFile.
settings.json is generated from the module's Nix attrset and has no repo file at all.

Verification

nix eval .#nixosConfigurations.neogaia.config.system.stateVersion returns 26.05 at the branch tip.
The branch is fast-forwardable from main.

Before merging

One thing the reviewer should weigh, not blocking:

Do not pull this branch into the ~/.dotfiles bare repo. That repo has $HOME as its work tree, so the removal commit would delete the live ~/.config/fish, ~/.config/nvim, ~/.gitconfig and the rest on a machine still running CachyOS. ~/.dotfiles should stay pinned to the current main until the migration actually lands.

Commit messages

The rebased messages were rewritten to drop forge-specific and workflow references, since this repository is mirrored to GitHub where they resolve to nothing or to the wrong thing: (task NNNN) suffixes, Address PR review: prefixes, and cross-references to task numbers in bodies. Each subject now names the change itself.

Content is untouched — every commit tree is byte-identical to before the rewrite, verified pairwise.

— Claude

Folds the separate `dotfiles-nixos` repository into this one, so a single repo owns machine configuration instead of two serving the same purpose. ## What this does The 28 commits from `dotfiles-nixos` are rebased on top of this repo's `main`, followed by one commit removing the pre-NixOS tree. The branch tip is byte-identical to `dotfiles-nixos@main` — verified with `git diff`, which is empty. ``` 89 commits ─┬─ 60 existing dotfiles history (unchanged) ├─ 28 nixos work, replayed on top └─ 1 removal of the old tree ``` The two repositories turned out to be almost perfectly disjoint: exactly one tracked path collided (`.gitignore`), resolved as the union during the rebase and then reset to the flake's own version, since the dotfiles-era entries no longer describe anything in the tree. ## What was removed, and why it is safe The removal commit deletes 88 files: `.config/`, `.gitconfig`, `.github/`, and the repo-local `.claude/`. Every one remains reachable in history for reference while the migration finishes. The `.claude/` deletions are worth calling out specifically, because they are superseded rather than dropped. `modules/claude-code/claude-code.nix` already carries all 14 skills via `skills = ./skills`, plus `gitea-axi` which the old copy lacked, and installs `hooks/attention-bell.sh` through `builtins.readFile`. `settings.json` is generated from the module's Nix attrset and has no repo file at all. ## Verification `nix eval .#nixosConfigurations.neogaia.config.system.stateVersion` returns `26.05` at the branch tip. The branch is fast-forwardable from `main`. ## Before merging One thing the reviewer should weigh, not blocking: - **Do not pull this branch into the `~/.dotfiles` bare repo.** That repo has `$HOME` as its work tree, so the removal commit would delete the live `~/.config/fish`, `~/.config/nvim`, `~/.gitconfig` and the rest on a machine still running CachyOS. `~/.dotfiles` should stay pinned to the current `main` until the migration actually lands. ## Commit messages The rebased messages were rewritten to drop forge-specific and workflow references, since this repository is mirrored to GitHub where they resolve to nothing or to the wrong thing: `(task NNNN)` suffixes, `Address PR review:` prefixes, and cross-references to task numbers in bodies. Each subject now names the change itself. Content is untouched — every commit tree is byte-identical to before the rewrite, verified pairwise. — Claude

alexion added 30 commits 2026-07-19 08:25:57 -04:00

docs: establish domain model, MVI spec, and environment reference d5b67947f9

Capture the design work for the NixOS migration before any implementation:

- .claude/CONTEXT.md: domain glossary (Host, Module, Skeleton, Auto-loader,
  Enable convention, unstable/stable overlay)
- .claude/adr/0001-sops-nix-for-secrets.md: secrets tooling decision
- .claude/spec/laptop-mvi.md: frozen minimum-viable-install spec for neogaia

- reference/: read-only snapshot of the current CachyOS configs (secrets and
  state excluded), plus ENVIRONMENT.md profiling the live environment to guide
  replication

feat: build the Skeleton and a minimal neogaia Host 9b36cfadd6

Stand up the walking skeleton the rest of the laptop MVI extends and
re-verifies against: the whole neogaia Host evaluates and its system
toplevel builds (nix flake check green).

- flake.nix: hand-rolled flake (no flake-parts). Base nixos-unstable, plus
  nixpkgs-unstable and nixos-25.05 for the per-package unstable/stable
  overlays, home-manager (nixpkgs followed), and chaotic-nyx (deliberately
  not following our nixpkgs, to keep its binary cache usable). checks build
  each Host toplevel.
- lib/: trimmed helper lib — the Auto-loader (recursive .nix discovery, no
  null-placeholder hack), the host-builder, and the script-from-file helper.
  Deps inherited explicitly; no with lib.my, no nixosModules output.
- system/: shared base config — the unstable/stable overlays, the user
  option (defaults to alexion, in wheel, drives system + home-manager user
  in lockstep), flakes, git, and home-manager as a NixOS module.
- modules/example.nix: Auto-loader / Enable-convention reference Module,
  inert until enabled.
- hosts/neogaia/: minimal laptop Host — placeholder filesystems, bootloader,
  and hardware profile.
- CLAUDE.md: project agent instructions with a Gotchas section (nix on the
  CachyOS dev host, the chaotic overlay/cache behaviour, the Gitea CLI).

build(deps): pin the stable overlay and stateVersion to 26.05 25e12f79de

26.05 is the latest stable NixOS release as of now (26.11 is still the
in-development branch that nixos-unstable reports); the previous 25.05 pin
was a release behind.

- flake.nix / flake.lock: stable overlay tracks nixos-26.05.
- neogaia system.stateVersion and the base home.stateVersion set to 26.05
  (fresh install, so aligning to the current stable release).
- Refresh the "latest stable release" references in the project docs to
  match.

Other inputs are rolling branches (nixos-unstable, nixpkgs-unstable,
chaotic nyxpkgs-unstable) or master (home-manager, per spec), so they carry
no version to bump.

style: scope in-file comments to the current file state cfe8d4ff9f

In-file comments should describe only what the file currently is, not task
numbers, external tooling, or past/future states.

- hosts/neogaia: drop the "replaced by disko" / "arrive later" framing;
  describe the filesystems and hardware profile as the placeholder values
  they are.
- lib: drop the "no null-placeholder traversal hack" comparison to a prior
  implementation.
- system: drop "no impure environment lookup" from the user.name description
  and the sops/post-boot roadmap from the user comment.

feat(neogaia): declare the encrypted disk with disko da30375413

Add disko as a flake input (following nixpkgs) and wire its NixOS module
into the host-builder, so any Host can declare a disk layout while the
layout itself stays a per-Host concern.

neogaia's layout (hosts/neogaia/disk.nix): one GPT NVMe disk with a
systemd-boot EFI system partition and a LUKS container holding btrfs with
@root/@home/@nix subvolumes. The initrd prompts for the passphrase on a
normal boot. Swap is RAM-backed zram, so there is no on-disk swap
partition; zramSwap is enabled directly for now. The placeholder
fileSystems are removed since disko now derives them.

style(neogaia): scope the hardware comments to the current file state bfc9e6f75b

feat(neogaia): add the CachyOS kernel and hardware enablement 053c4de529

Select the CachyOS kernel per-Host via boot.kernelPackages, enable Intel
microcode and redistributable firmware (ath10k for the QCA6174 wifi), and
move zram behind a toggle Module. Declare the chaotic binary cache in the
base Nix settings (extra-substituters/keys) so the built system fetches the
kernel from nyx-cache rather than compiling it.

refactor(neogaia): drop the zram Module and enable zram inline 8f83c3ca8c

modules/zram.nix only wrapped the native zramSwap.enable toggle without
adding anything. Rewrite the touched comments to describe only the current
file content, and record the in-file-comment convention in CLAUDE.md.

docs: require an agent sign-off on Gitea comments 194d64dacd

Add a convention: comments posted to Gitea go out under the operator's
account, so sign each with a — Claude sign-off to attribute them to the agent.

feat(neogaia): enable networking and set the base locale 20f5b33e00

Turn the booted laptop into a usable, remotely reachable console: enable
NetworkManager so wifi can be joined from the console and an SSH daemon so
the rest of the setup can be driven over the network. Set the base locale to
timezone America/New_York, locale en_GB.UTF-8, and console keymap us.

These live inline in the neogaia Host rather than behind enable Modules,
matching the single-Host MVI precedent; a shared locale/networking Module can
be extracted once a second Host needs the same settings. SSH keeps default
password auth on, as first-boot access relies on the hand-set bootstrap
password until key/sops-based auth lands post-install.

feat(fish): add a native Module and set it as neogaia's login shell 8346d63e64

Translate the CachyOS fish snapshot into a home-manager Module: the
fastfetch greeting, the bat-backed manpager, the done and bang-bang
plugins (from nixpkgs, not a plugin manager), the history/backup/copy
helper functions, and the eza and navigation aliases. Pacman-specific
aliases are dropped or replaced with NixOS equivalents (update ->
nixos-rebuild switch, cleanup -> nix-collect-garbage). Enabling the
Module also makes fish the user's default login shell.

feat(fish): gate the default shell and prefer abbreviations 9eb0fe797a

Move the login-shell switch behind a new modules.fish.defaultShell
option (default false; neogaia opts in). Convert every non-eza alias to
an abbreviation, set preferAbbrs and pin generateCompletions, and switch
the command line to vi-style editing. Cap navigation at four dots and
drop psmem/psmem10/dir/vdir/please. Comment the installed packages.

refactor(fish): read the non-trivial snippets from files 16f29bd64a

Move the interactiveShellInit block and the copy function body into
modules/fish/*.fish and pull them in with builtins.readFile, so the
non-trivial fish lives in real fish files (highlighting, fish_indent)
instead of inline Nix strings. The Auto-loader only collects .nix, so
the new .fish files are ignored by it. Rendered config is unchanged.

docs(fish): record the file-extraction in the project notes b91e434c87

refactor(fish): lay the Module out like ~/.config/fish 5a89d4addb

Move the Module to modules/fish/fish.nix and mirror a real fish config
directory beside it: config.fish (interactive init), conf.d/done.fish
(the done plugin tuning, now a real conf.d file), and functions/copy.fish.
completions/ and themes/ are omitted as they have no content and git
cannot track empty directories.

refactor(fish): assemble the interactive init in Nix, not at runtime 95869fb11f

Fold the done plugin tuning back into config.fish and drop the conf.d
fragment: config.fish is read whole into interactiveShellInit, so Nix
assembles the interactive init at build time instead of fish autoloading
a separate conf.d file. functions/copy.fish stays a function file, the
idiomatic home for a lazily-autoloaded function.

refactor(fish): split config.fish into fragments concatenated by Nix f54d0460ad

Break the interactive init into concern-scoped fish files under
modules/fish/config/ (bindings, env, done, path) and assemble them with
lib.concatMapStringsSep + readFile into a single interactiveShellInit, so
home-manager still writes one ~/.config/fish/config.fish. The pieces stay
editable as separate fish files; the rendered file is unchanged.

refactor(fish): merge the config fragments back into one config.fish 2d6eb929d7

The interactive init is small; four fragment files was over-splitting it.
Keep the mechanic (a real fish file inlined by Nix into config.fish) but
merge the fragments into a single modules/fish/config.fish read with
builtins.readFile. Rendered config is unchanged.

style(fish): split the plugin comment and drop a redundant one 7e53ecd946

feat(tmux): add a native Module and enable it on neogaia 80d1587189

Configure tmux through home-manager's programs.tmux: the settings it exposes
as options (prefix, keyMode, mouse, baseIndex, clock24, escapeTime,
historyLimit, terminal) are set as options, and every setting it has no option
for is read verbatim from modules/tmux/extra.conf. No tmux plugin manager is
used. The generated config is behaviourally identical to the reference, verified
by parsing it with a live tmux binary.

chore: untrack the reference/ snapshot and gitignore it 98fecc314f

reference/ is a read-only snapshot of the pre-migration machine, kept
locally for porting configs but not part of the flake. Stop tracking it
and ignore it so migrations don't churn the repo.

feat(nvim): configure Neovim via nixvim with Nix-managed plugins 6f9309d329

Add an nvim Module that configures Neovim declaratively through nixvim,
wired as a flake input and consumed as its home-manager module. Options,
globals, keymaps, and plugin settings are typed Nix; the colorscheme
call and two autocmds live in modules/nvim/config.lua via extraConfigLua.
Plugins come from nixpkgs (no plugin manager, no runtime cloning); git,
ripgrep, and fd are provided from Nix; treesitter grammars are built by
Nix so no runtime compiler is needed.

Functionally matches the previous config (plugins, keymaps, options, the
nord colorscheme, markdown conceal, the Neogit blame toggle), verified
headless against the generated init.

feat(claude-code): add a Module and enable it on neogaia 505002bb2b

Install Claude Code through home-manager's native programs.claude-code
module, matching how the tmux and fish Modules use their home-manager
options rather than a raw home.packages entry. The feature Module at
modules/claude-code/claude-code.nix stays thin — just the enable option
and the delegation — and writes no settings, so login and first-run
configuration remain interactive and no auth material enters the repo.

Signing in without a browser (needed over the console or SSH) is
documented in modules/claude-code/authentication.md: the paste-code OAuth
flow, where the printed URL is opened on another device and the code
pasted back, and the ANTHROPIC_API_KEY path for non-interactive use.

The neogaia toplevel builds with claude-code-2.1.209 included.

feat(claude-code): manage the user's global config in the Module b7363ed7e1

Bring the declarative half of ~/.claude into modules/claude-code and apply
it when the Module is enabled: the global agent instructions (context =
./CLAUDE.md), the skills tree (skills = ./skills), the attention-bell hook,
and settings.json (model = opus plus the Stop/Notification/SessionStart
hook wiring).

Runtime state (projects, plugins, cache, history, sessions) and the
.credentials.json secret are left out, so login survives rebuilds and no
secret enters the repo. Verified against the built home-files that
~/.claude/{CLAUDE.md,settings.json,skills,hooks/attention-bell.sh} are
generated, the hook executable.

docs(neogaia): document the one-shot install flow 7810425849

Add docs/install.md, the operator runbook that turns the completed
neogaia Host into a running encrypted laptop from the NixOS live ISO:
push the flake to its remote, join wifi, clone the repo locally,
disko-install against neogaia with the chaotic substituter handed to the
install-time daemon, set the bootstrap login password by hand via
nixos-enter, and reboot.

style: trim verbose comments to concise, self-contained notes 91d0a7d8e4

Cut restated "what", domain-glossary framing, cross-file consumption
narration, and against-alternative justification from in-file comments;
keep only non-obvious "why" and load-bearing pointers. Drop the
`generateCompletions` line (a no-op restatement of the upstream default)
and its comment.

refactor(lib): remove the unused scriptFromFile helper 6a10f760cf

It had no callers; the built system's derivation is unchanged by its
removal.

docs: rewrite the in-file comment convention 77e853ab49

Encode the sharpened ruleset: why-over-what, self-containment, the
absence-only cross-file exception, no domain-glossary terms, no
against-alternative or future-state framing, one-line file headers,
placeholder wording, and how option description strings differ.

chore!: remove the pre-NixOS dotfiles tree 41709bb977

The flake and its modules now own every config these files provided;
they remain in history for reference while the migration finishes.

BREAKING CHANGE: `.config/`, `.gitconfig`, and `.github/` no longer exist
at the repository root. A checkout that deploys this tree into `$HOME`
will delete the live configs it previously installed.

docs: adopt Conventional Commits for commit messages 064971f601

Vendor the v1.0.0 specification as docs/conventional-commits.md and record
the convention in CLAUDE.md: type and optional scope, where the scope names
the module or host, and no Gitea-specific references, since this repository
is mirrored to GitHub where issue and pull-request numbers resolve to
unrelated things.

alexion force-pushed nixos-migration from 0cb63b06f5 to 064971f601

2026-07-19 08:25:57 -04:00

Compare

alexion added 1 commit 2026-07-19 08:28:35 -04:00

docs: standardise on gitea-axi as the Gitea CLI bdb6f01934

The Gotchas entry named `tea` as the CLI for issue and pull-request work.
`gitea-axi` supersedes it; `tea` stays installed only to hold the `axi`
login that `gitea-axi` authenticates from.

alexion added 1 commit 2026-07-19 08:34:23 -04:00

docs(claude-code): teach the skill-management skills the Nix layout 7809e079e3

~/.claude/skills is generated by home-manager: the directories are real
but every leaf file is a read-only symlink into the store. The skills
that author and install skills assumed it was an ordinary writable tree.

- craft-skill: personal skills are authored in modules/claude-code/skills
  and applied by a rebuild, never edited under ~/.claude/skills; writing
  there succeeds silently and strands the skill outside the repo.
- setup-skills, update-skills: copy out of the library with cp -rL and
  chmod -R u+w. A plain cp -r copies the symlinks, committing store paths
  into the project, and dereferenced files keep the store's read-only mode.
- craft-skill also staged through `dot add`, a fish function this repo no
  longer carries; plain git add replaces it.

alexion merged commit 7809e079e3 into main

2026-07-19 09:30:46 -04:00

alexion deleted branch nixos-migration

2026-07-19 09:30:46 -04:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: alexion/dotfiles#1