feat: improve justfiles

.just/machine.just

@@ -1,11 +1,14 @@
-@_default: list
+set unstable := true
+set quiet := true
+
+_default: list
 
 [doc('List machines')]
-@list:
+list:
     ls -1 ../systems/x86_64-linux/
 
 [doc('Update the target machine')]
 [no-exit-message]
-@update machine:
-    just assert '-d "../systems/x86_64-linux/{{ machine }}"' "Machine {{ machine }} does not exist, must be one of: $(ls ../systems/x86_64-linux/ | sed ':a;N;$!ba;s/\n/, /g')"
-    nixos-rebuild switch -L --use-remote-sudo --target-host {{ machine }} --flake ..#{{ machine }}
+update machine:
+    just assert '-d "../systems/x86_64-linux/{{ machine }}"' "Machine {{ machine }} does not exist, must be one of: $(ls ../systems/x86_64-linux/ | tr '\n' ' ')"
+    nixos-rebuild switch --use-remote-sudo --target-host {{ machine }} --flake ..#{{ machine }}

.just/vars.just

@@ -1,21 +1,16 @@
 set unstable := true
+set quiet := true
 
 base_path := invocation_directory() / "systems/x86_64-linux"
 
-# sops := "nix shell nixpkgs#sops --command sops"
-# yq := "nix shell nixpkgs#yq --command yq"
-
-sops := "sops"
-yq := "yq"
-
-@_default:
+_default:
     just --list
 
 [doc('list all vars of the target machine')]
 list machine:
     sops decrypt {{ base_path }}/{{ machine }}/secrets.yml
 
-@edit machine:
+edit machine:
     sops edit {{ base_path }}/{{ machine }}/secrets.yml
 
 @set machine key value:
@@ -26,10 +21,10 @@ list machine:
 
     echo "Done"
 
-@get machine key:
+get machine key:
     sops decrypt {{ base_path }}/{{ machine }}/secrets.yml | yq ".$(echo "{{ key }}" | sed -E 's/\//./g')"
 
-@remove machine key:
+remove machine key:
     sops unset {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')"
 
     git add {{ base_path }}/{{ machine }}/secrets.yml

.justfile

@@ -1,33 +1,40 @@
-@_default:
-  just --list --list-submodules
+_default:
+    just --list --list-submodules
+
+set unstable
+set quiet
 
-[doc('Manage vars')]
 mod vars '.just/vars.just'
-
-[doc('Manage machines')]
 mod machine '.just/machine.just'
 
 [doc('Show information about project')]
-@show:
-  echo "show"
+show:
+    echo "show"
 
 [doc('update the flake dependencies')]
-@update:
-  nix flake update
-  git commit -m 'chore: update dependencies' -- ./flake.lock > /dev/null
-  echo "Done"
+update:
+    nix flake update
+    git commit -m 'chore: update dependencies' -- ./flake.lock > /dev/null
+    echo "Done"
+
+[doc('Rebase branch on main')]
+rebase:
+    git stash -q \
+    && git fetch \
+    && git rebase origin/main \
+    && git stash pop -q
+
+    echo "Done"
 
 [doc('Introspection on flake output')]
-@select key:
-  nix eval --show-trace --json .#{{ key }} | jq .
-
-
+select key:
+    nix eval --json .#{{ key }} | jq .
 
 #===============================================================================================
 # Utils
-#===============================================================================================
-[no-exit-message]
+# ===============================================================================================
 [no-cd]
+[no-exit-message]
 [private]
-@assert condition message:
-  [ {{ condition }} ] || { echo -e 1>&2 "\n\x1b[1;41m Error \x1b[0m {{ message }}\n"; exit 1; }
+assert condition message:
+    [ {{ condition }} ] || { echo -e 1>&2 "\n\x1b[1;41m Error \x1b[0m {{ message }}\n"; exit 1; }