Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
55 changes: 0 additions & 55 deletions CONTRIBUTING.adoc

This file was deleted.

8 changes: 4 additions & 4 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -1187,11 +1187,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:
Expand Down
2 changes: 1 addition & 1 deletion QUICKSTART-MAINTAINER.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Output: `{{BUILD_OUTPUT_PATH}}`

[source,bash]
----
guix build -f guix.scm
guix build -f build/guix.scm
----

=== Nix
Expand Down
2 changes: 1 addition & 1 deletion docs/RSR_OUTLINE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 0 additions & 28 deletions guix.scm

This file was deleted.

Loading