From 9a5473e179ae1d39caa999b82e7c85afa5959522 Mon Sep 17 00:00:00 2001 From: Bernardo Magri Date: Sun, 14 Jun 2026 20:48:06 +0100 Subject: [PATCH] docs: record the branch/release model + sanitize progress Document the main=dev / v1=release-pointer model in flake.nix (where the v1 ref is defined) and mark the repo-sanitize roadmap items shipped (installer prune, option-table reconcile, settings untrack, branch realignment). Co-Authored-By: Claude Opus 4.8 --- docs/ROADMAP.md | 23 +++++++++++++++-------- flake.nix | 7 +++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md index ad78800..5e5587f 100644 --- a/docs/ROADMAP.md +++ b/docs/ROADMAP.md @@ -148,14 +148,21 @@ how to override it. Items marked ✓ are shipped. cache. Remaining (optional): a session-level `SSH_AUTH_SOCK` export so GUI clients launched outside a shell also see the agent. - **Sanitize & organize the repo:** a housekeeping pass for consistency - and clarity. Candidate targets (scope still to be defined): prune - now-redundant config (e.g. the installer still writes - `console.useXkbConfig` / `boot.initrd.systemd.enable` into `system.nix`, - which are distro-wide defaults as of the LUKS-keymap fix); reconcile the - README option tables with the actual `nomarchy.*` surface; audit - comments/docs for drift against the code; and re-check that every file - still earns its place under the `modules`/`hosts`/`themes`/`pkgs`/`tools` - rule of thumb. + and clarity. + - ✓ pruned now-redundant config: the installer no longer writes + `console.useXkbConfig` / `boot.initrd.systemd.enable` into `system.nix` + (distro-wide defaults since the LUKS-keymap fix), nor the offline-pin + test fixture in `flake.nix`. + - ✓ reconciled the README option tables with the live `nomarchy.*` + surface (added keys/fastfetch/snapper/greeter.autoLogin). + - ✓ untracked `.claude/settings.local.json` (machine-local) + gitignored. + - ✓ **branch/release model:** `main` is the development default; `v1` is + the release pointer downstreams pin (`?ref=v1`), advanced to main once + a batch is tested — rolling, no tags. Brought `main` current (it was a + stale legacy-merge), and deleted the dead `refactor` / `wave/nixos-26.05` + branches (kept `legacy` for history). See the comment in `flake.nix`. + - Remaining (optional): re-check that every file still earns its place + under the `modules`/`hosts`/`themes`/`pkgs`/`tools` rule of thumb. - **Full docs review & restructure:** a dedicated pass over all the prose, not just the code-adjacent cleanup the repo-sanitize item covers. The README has grown to ~540 lines with a ~200-line roadmap inline — the diff --git a/flake.nix b/flake.nix index 0fb3fbc..3ce076f 100644 --- a/flake.nix +++ b/flake.nix @@ -51,8 +51,11 @@ (nixpkgs.lib.concatStringsSep "\n" (builtins.attrNames nixos-hardware.nixosModules)); nixpkgsPath = nixpkgs.outPath; - # v1 is the release branch: installed machines track it on - # `nix flake update` instead of the forge's default branch. + # Branch model: `main` is the development default; `v1` is the + # release pointer — the stable line for the NixOS 26.05 rewrite, + # advanced to main once a batch is tested (rolling, no tags). A + # future major bump would become `v2`. Installed machines track + # `?ref=v1` on `nix flake update`, not the forge's default branch. flakeUrl = "git+${gitUrl}?ref=v1"; # Future updates re-resolve from the forge (original); the install # itself resolves from the ISO store (locked = path) — fully