From a9214808678da1198a155097d79281aa0871a424 Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Mon, 25 Aug 2025 07:14:39 -0500
Subject: [PATCH] justfile | aliased up nix command

---
 justfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/justfile b/justfile
index 8e11a5c..89d178e 100644
--- a/justfile
+++ b/justfile
@@ -1,4 +1,5 @@
 HOSTNAME  := `hostname -s`
+nixcmd := "nix --extra-experimental-features flakes --extra-experimental-features nix-command"
 
 # Do as test build without installing
 test hostname=(HOSTNAME):
@@ -56,12 +57,12 @@ vm hostname=(HOSTNAME):
 buildiso hostname:
   @rm -f nixos-switch.log result
   @echo Running iso build
-  @NIXPKGS_ALLOW_UNFREE=1 nix run --impure nixpkgs#nixos-generators -- -f iso --flake .#{{hostname}} --system x86_64-linux -o ./{{hostname}}.sd &> nixos-switch.log || ( cat nixos-switch.log && false )
+  @NIXPKGS_ALLOW_UNFREE=1 {{nixcmd}} run --impure nixpkgs#nixos-generators -- -f iso --flake .#{{hostname}} --system x86_64-linux -o ./{{hostname}}.sd &> nixos-switch.log || ( cat nixos-switch.log && false )
 
 buildsd hostname:
   @rm -f nixos-switch.log result
   @echo Running sd build
-  @doas nix run nixpkgs#nixos-generators -- -f sd-aarch64 --flake .#{{hostname}} --system aarch64-linux -o ./{{hostname}}.sd &> nixos-switch.log || ( cat nixos-switch.log && false )
+  @doas {{nixcmd}} run nixpkgs#nixos-generators -- -f sd-aarch64 --flake .#{{hostname}} --system aarch64-linux -o ./{{hostname}}.sd &> nixos-switch.log || ( cat nixos-switch.log && false )
 
 # Stuff to do weekly
 weekly: pull clean update world ci push clean-world
@@ -69,7 +70,7 @@ weekly: pull clean update world ci push clean-world
 # Update flake.lock
 update:
   @echo "Updating flake.lock"
-  @nix flake update &> nixos-switch.log || ( cat nixos-switch.log && false )
+  @{{nixcmd}} flake update &> nixos-switch.log || ( cat nixos-switch.log && false )
   @rm -f nixos-switch.log
 
 # Clean up
@@ -81,7 +82,7 @@ clean hostname=(HOSTNAME):
   @echo "Garbage Collection"
   @colmena --impure exec --on {{hostname}} nix-collect-garbage --quiet --log-format bar --no-build-output --delete-old
   @echo "Store optimise"
-  @colmena --impure exec --on {{hostname}} nix store optimise
+  @colmena --impure exec --on {{hostname}} {{nixcmd}} store optimise
 
 # Clean up the world
 clean-world:
@@ -91,7 +92,7 @@ clean-world:
   @echo "Garbage Collection"
   @colmena --impure exec 'nix-collect-garbage --quiet --log-format bar --no-build-output --delete-old'
   @echo "Store optimise"
-  @colmena --impure exec 'nix store optimise'
+  @colmena --impure exec '{{nixcmd}} store optimise'
 
 # Push local changes to git
 push: