From 37819bb50fbd3bce78d4e6e610ab1ae084878c78 Mon Sep 17 00:00:00 2001 From: Bernardo Magri Date: Fri, 12 Jun 2026 09:50:09 +0100 Subject: [PATCH] =?UTF-8?q?feat:=20v1=20release=20branch=20=E2=80=94=20gen?= =?UTF-8?q?erated=20flakes=20and=20template=20track=20=3Fref=3Dv1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installed machines and the downstream template now resolve nomarchy from git+https://git.bemagri.xyz/bernardo/nomarchy.git?ref=v1 (the lock's original node carries the ref too), so `nix flake update` follows the release branch instead of the forge's default branch. README quickstart points at the real forge. Co-Authored-By: Claude Fable 5 --- README.md | 2 +- flake.nix | 6 ++++-- templates/downstream/flake.nix | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 48c115d..c1bff82 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Nomarchy is consumed as a flake input — you never fork or edit this repo: ```sh mkdir my-machine && cd my-machine -nix flake init -t github:YOUR-USER/nomarchy +nix flake init -t "git+https://git.bemagri.xyz/bernardo/nomarchy.git?ref=v1" ``` You own two files day-to-day: `system.nix` and `home.nix` (plus diff --git a/flake.nix b/flake.nix index e47a48e..11862e5 100644 --- a/flake.nix +++ b/flake.nix @@ -45,11 +45,13 @@ (nixpkgs.lib.concatStringsSep "\n" (builtins.attrNames nixos-hardware.nixosModules)); nixpkgsPath = nixpkgs.outPath; - flakeUrl = "git+${gitUrl}"; + # v1 is the release branch: installed machines track it on + # `nix flake update` instead of 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 # offline, even from a dirty-tree ISO. - originalNode = { type = "git"; url = gitUrl; }; + originalNode = { type = "git"; url = gitUrl; ref = "v1"; }; lockedNode = { type = "path"; path = self.outPath; diff --git a/templates/downstream/flake.nix b/templates/downstream/flake.nix index 47dec08..a764067 100644 --- a/templates/downstream/flake.nix +++ b/templates/downstream/flake.nix @@ -4,8 +4,8 @@ # The only input. nixpkgs, home-manager etc. come pinned through it — # tested together upstream. This file is written once (by you or the # installer) and never hand-edited afterwards; your machine lives in - # system.nix and home.nix. - inputs.nomarchy.url = "github:YOUR-USER/nomarchy"; # <- the distro repo + # system.nix and home.nix. v1 is the release branch. + inputs.nomarchy.url = "git+https://git.bemagri.xyz/bernardo/nomarchy.git?ref=v1"; outputs = { nomarchy, ... }: nomarchy.lib.mkFlake {