From 220fc7f699d6cf4cc6b2717bb68be8a8a2e50062 Mon Sep 17 00:00:00 2001 From: Bernardo Magri Date: Sat, 25 Apr 2026 10:46:59 +0100 Subject: [PATCH] fix: point downstream flakes at git.bemagri.xyz, not github Upstream Nomarchy is hosted on the self-hosted Gitea at git.bemagri.xyz/bernardo/Nomarchy.git, not github.com/bemagri/nomarchy. - installer/install.sh: generated `nomarchy.url` now uses `git+https://git.bemagri.xyz/bernardo/Nomarchy.git` (with `?rev=` for the pinned form). - MIGRATION.md: matches; the `hardware_detect` clone snippet now points at the same URL. Co-Authored-By: Claude Opus 4.7 --- MIGRATION.md | 5 +++-- installer/install.sh | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MIGRATION.md b/MIGRATION.md index b6c19a7..62d69c0 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -41,7 +41,8 @@ same shape the Nomarchy installer produces — see inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; - nomarchy.url = "github:bemagri/nomarchy"; # or pin to a commit/tag + nomarchy.url = "git+https://git.bemagri.xyz/bernardo/Nomarchy.git"; + # …or pin: "git+https://git.bemagri.xyz/bernardo/Nomarchy.git?rev=" nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { url = "github:nix-community/home-manager/release-25.11"; @@ -142,7 +143,7 @@ system: ```bash nix shell nixpkgs#git -c \ - bash -c 'tmp=$(mktemp -d); git clone --depth=1 https://github.com/bemagri/nomarchy "$tmp" >/dev/null 2>&1; \ + bash -c 'tmp=$(mktemp -d); git clone --depth=1 https://git.bemagri.xyz/bernardo/Nomarchy.git "$tmp" >/dev/null 2>&1; \ source "$tmp/installer/hardware-db.sh"; nomarchy_detect_hw' ``` diff --git a/installer/install.sh b/installer/install.sh index c628254..693476c 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -736,11 +736,13 @@ generate_flake_config() { # Pin the upstream Nomarchy flake to the exact commit we're installing # from so the first post-reboot `nixos-rebuild` doesn't silently pull a # newer main. Fall back to tracking main if we couldn't resolve a SHA. + # Upstream lives on the self-hosted Gitea at git.bemagri.xyz; flakes + # consume it via the `git+https://` URL form. local nomarchy_url if [[ -n "$NOMARCHY_REV" ]]; then - nomarchy_url="github:bemagri/nomarchy/$NOMARCHY_REV" + nomarchy_url="git+https://git.bemagri.xyz/bernardo/Nomarchy.git?rev=$NOMARCHY_REV" else - nomarchy_url="github:bemagri/nomarchy" + nomarchy_url="git+https://git.bemagri.xyz/bernardo/Nomarchy.git" fi # flake.nix — the generator uses a non-quoted heredoc so $HOSTNAME,