From 48d6ebdabebc2e37a1286beb8300f51436d237a6 Mon Sep 17 00:00:00 2001 From: "Jonathan D.A. Jewell" <6759885+hyperpolymath@users.noreply.github.com> Date: Sat, 19 Sep 2026 09:28:34 +0000 Subject: [PATCH] refactor(root): move root artefacts to their canonical locations Applies the estate root-shape rollout: files that are not root-level by necessity move to where their tooling and the estate canon expect them, and every reference to them is updated in the same change. * .envrc * .machine_readable/contractiles/Justfile * .machine_readable/root-allow.txt * Justfile * QUICKSTART-MAINTAINER.adoc * build/guix.scm (from guix.scm) -> build/guix.scm * docs/RSR_OUTLINE.adoc Verified with `git apply --check` against current main before committing; no behaviour change intended, the Justfile entry points keep working. --- .envrc | 4 ++-- .machine_readable/contractiles/Justfile | 8 +++---- .machine_readable/root-allow.txt | 1 + Justfile | 8 +++---- QUICKSTART-MAINTAINER.adoc | 2 +- docs/RSR_OUTLINE.adoc | 2 +- guix.scm | 28 ------------------------- 7 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 guix.scm diff --git a/.envrc b/.envrc index 8b08782..45b6b74 100644 --- a/.envrc +++ b/.envrc @@ -7,8 +7,8 @@ if has asdf; then use asdf fi -# Load Guix shell if guix.scm exists -if has guix && [ -f guix.scm ]; then +# Load Guix shell if build/guix.scm exists +if has guix && [ -f build/guix.scm ]; then use guix fi diff --git a/.machine_readable/contractiles/Justfile b/.machine_readable/contractiles/Justfile index 4246729..abb4807 100644 --- a/.machine_readable/contractiles/Justfile +++ b/.machine_readable/contractiles/Justfile @@ -476,8 +476,8 @@ self-assess: echo " → KEEP if others might build with Nix." fi - if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then - echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix." + if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then + echo " ○ build/guix.scm — Guix package. Safe to remove if you don't use Guix." echo " → KEEP if others might build with Guix." fi @@ -1191,11 +1191,11 @@ state-phase: # Enter Guix development shell (primary) guix-shell: - guix shell -D -f guix.scm + guix shell -D -f build/guix.scm # Build with Guix guix-build: - guix build -f guix.scm + guix build -f build/guix.scm # Enter Nix development shell (fallback) nix-shell: diff --git a/.machine_readable/root-allow.txt b/.machine_readable/root-allow.txt index ceb2b98..3b3fccb 100644 --- a/.machine_readable/root-allow.txt +++ b/.machine_readable/root-allow.txt @@ -1 +1,2 @@ CLAUDE.md +build/ # build orchestration: guix.scm relocated here (canon 1.2.1 guix-primary template_ref = "build/") diff --git a/Justfile b/Justfile index 6bc20e5..d8ebaee 100644 --- a/Justfile +++ b/Justfile @@ -458,8 +458,8 @@ self-assess: echo " → KEEP if others might build with Nix." fi - if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then - echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix." + if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then + echo " ○ build/guix.scm — Guix package. Safe to remove if you don't use Guix." echo " → KEEP if others might build with Guix." fi @@ -1180,11 +1180,11 @@ state-phase: # Enter Guix development shell (primary) guix-shell: - guix shell -D -f guix.scm + guix shell -D -f build/guix.scm # Build with Guix guix-build: - guix build -f guix.scm + guix build -f build/guix.scm # Enter Nix development shell (fallback) nix-shell: diff --git a/QUICKSTART-MAINTAINER.adoc b/QUICKSTART-MAINTAINER.adoc index 78d9b5f..d2123a6 100644 --- a/QUICKSTART-MAINTAINER.adoc +++ b/QUICKSTART-MAINTAINER.adoc @@ -32,7 +32,7 @@ Output: `{{BUILD_OUTPUT_PATH}}` [source,bash] ---- -guix build -f guix.scm +guix build -f build/guix.scm ---- === Nix diff --git a/docs/RSR_OUTLINE.adoc b/docs/RSR_OUTLINE.adoc index de826a7..5230bee 100644 --- a/docs/RSR_OUTLINE.adoc +++ b/docs/RSR_OUTLINE.adoc @@ -37,7 +37,7 @@ git init just init # Enter development environment -guix shell -D -f guix.scm +guix shell -D -f build/guix.scm # Validate compliance just validate-rsr diff --git a/guix.scm b/guix.scm deleted file mode 100644 index 54a84a3..0000000 --- a/guix.scm +++ /dev/null @@ -1,28 +0,0 @@ -;; SPDX-License-Identifier: MPL-2.0 -;; Guix development environment. -;; Usage: guix shell -D -f guix.scm - -(use-modules (guix packages) - (guix build-system gnu) - (guix licenses) - (gnu packages base) - (gnu packages bash) - (gnu packages base) - (gnu packages java) - (gnu packages rust) - (gnu packages cmake) - (gnu packages zig) - (gnu packages golang) - (gnu packages node) - (gnu packages python)) - -(package - (name "nextgen-typing") - (version "0.1.0") - (source #f) - (build-system gnu-build-system) - (inputs (list coreutils bash make openjdk rust cmake zig go node python)) - (synopsis "nextgen-typing") - (description "nextgen-typing — part of the hyperpolymath ecosystem.") - (home-page "https://github.com/hyperpolymath/nextgen-typing") - (license ((@@ (guix licenses) license) "MPL-2.0" "https://github.com/hyperpolymath/palimpsest-license")))