Skip to content

Commit f7ae549

Browse files
committed
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 * CONTRIBUTING.adoc (deleted) * 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.
1 parent dcb3491 commit f7ae549

7 files changed

Lines changed: 12 additions & 95 deletions

File tree

.envrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if has asdf; then
77
use asdf
88
fi
99

10-
# Load Guix shell if guix.scm exists
11-
if has guix && [ -f guix.scm ]; then
10+
# Load Guix shell if build/guix.scm exists
11+
if has guix && [ -f build/guix.scm ]; then
1212
use guix
1313
fi
1414

.machine_readable/contractiles/Justfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ self-assess:
476476
echo " → KEEP if others might build with Nix."
477477
fi
478478
479-
if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then
480-
echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix."
479+
if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then
480+
echo "build/guix.scm — Guix package. Safe to remove if you don't use Guix."
481481
echo " → KEEP if others might build with Guix."
482482
fi
483483
@@ -1185,11 +1185,11 @@ state-phase:
11851185
11861186
# Enter Guix development shell (primary)
11871187
guix-shell:
1188-
guix shell -D -f guix.scm
1188+
guix shell -D -f build/guix.scm
11891189
11901190
# Build with Guix
11911191
guix-build:
1192-
guix build -f guix.scm
1192+
guix build -f build/guix.scm
11931193
11941194
# Enter Nix development shell (fallback)
11951195
nix-shell:

CONTRIBUTING.adoc

Lines changed: 0 additions & 55 deletions
This file was deleted.

Justfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,8 @@ self-assess:
476476
echo " → KEEP if others might build with Nix."
477477
fi
478478
479-
if [ -f "guix.scm" ] && ! command -v guix >/dev/null 2>&1; then
480-
echo " ○ guix.scm — Guix package. Safe to remove if you don't use Guix."
479+
if [ -f "build/guix.scm" ] && ! command -v guix >/dev/null 2>&1; then
480+
echo "build/guix.scm — Guix package. Safe to remove if you don't use Guix."
481481
echo " → KEEP if others might build with Guix."
482482
fi
483483
@@ -1185,11 +1185,11 @@ state-phase:
11851185
11861186
# Enter Guix development shell (primary)
11871187
guix-shell:
1188-
guix shell -D -f guix.scm
1188+
guix shell -D -f build/guix.scm
11891189
11901190
# Build with Guix
11911191
guix-build:
1192-
guix build -f guix.scm
1192+
guix build -f build/guix.scm
11931193
11941194
# Enter Nix development shell (fallback)
11951195
nix-shell:

QUICKSTART-MAINTAINER.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Output: `{{BUILD_OUTPUT_PATH}}`
3232

3333
[source,bash]
3434
----
35-
guix build -f guix.scm
35+
guix build -f build/guix.scm
3636
----
3737

3838
=== Nix

docs/RSR_OUTLINE.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ git init
3737
just init
3838
3939
# Enter development environment
40-
guix shell -D -f guix.scm
40+
guix shell -D -f build/guix.scm
4141
4242
# Validate compliance
4343
just validate-rsr

guix.scm

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)