diff --git a/.just/machine.just b/.just/machine.just
index cbdf345..3e3ba14 100644
--- a/.just/machine.just
+++ b/.just/machine.just
@@ -1,11 +1,14 @@
-@_default: list
+set unstable := true
+set quiet := true
+
+_default: list
 
 [doc('List machines')]
-@list:
-  ls -1 ../systems/x86_64-linux/
+list:
+    ls -1 ../systems/x86_64-linux/
 
-[no-exit-message]
 [doc('Update the target 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 }}
\ No newline at end of file
+[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/ | tr '\n' ' ')"
+    nixos-rebuild switch --use-remote-sudo --target-host {{ machine }} --flake ..#{{ machine }}
diff --git a/.just/vars.just b/.just/vars.just
index d8bd181..230f00c 100644
--- a/.just/vars.just
+++ b/.just/vars.just
@@ -1,36 +1,33 @@
-set unstable
+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:
-  just --list
+_default:
+    just --list
 
 [doc('list all vars of the target machine')]
 list machine:
-  sops decrypt {{ base_path }}/{{ machine }}/secrets.yml
-  
-@edit machine:
-  sops edit {{ base_path }}/{{ machine }}/secrets.yml
-  
+    sops decrypt {{ base_path }}/{{ machine }}/secrets.yml
+
+edit machine:
+    sops edit {{ base_path }}/{{ machine }}/secrets.yml
+
 @set machine key value:
-  sops set {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')" "\"$(echo '{{ value }}' | sed 's/\"/\\\"/g')\"" 
+    sops set {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')" "\"$(echo '{{ value }}' | sed 's/\"/\\\"/g')\""
 
-  git add {{ base_path }}/{{ machine }}/secrets.yml
-  git commit -m 'chore(secrets): set secret "{{ key }}" for machine "{{ machine}}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null
+    git add {{ base_path }}/{{ machine }}/secrets.yml
+    git commit -m 'chore(secrets): set secret "{{ key }}" for machine "{{ machine }}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null
 
-  echo "Done"
-  
-@get machine key:
-  sops decrypt {{ base_path }}/{{ machine }}/secrets.yml | yq ".$(echo "{{ key }}" | sed -E 's/\//./g')"
-  
-@remove machine key:
-  sops unset {{ base_path }}/{{ machine }}/secrets.yml "$(printf '%s\n' '["{{ key }}"]' | sed -E 's#/#"]["#g; s/\["([0-9]+)"\]/[\1]/g')"
+    echo "Done"
 
-  git add {{ base_path }}/{{ machine }}/secrets.yml
-  git commit -m 'chore(secrets): removed secret "{{ key }}" from machine "{{ machine}}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null
+get machine key:
+    sops decrypt {{ base_path }}/{{ machine }}/secrets.yml | yq ".$(echo "{{ key }}" | sed -E 's/\//./g')"
 
-  echo "Done"
\ No newline at end of file
+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
+    git commit -m 'chore(secrets): removed secret "{{ key }}" from machine "{{ machine }}"' -- {{ base_path }}/{{ machine }}/secrets.yml > /dev/null
+
+    echo "Done"
diff --git a/.justfile b/.justfile
index 3a15d20..1937f04 100644
--- a/.justfile
+++ b/.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 --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; }
\ No newline at end of file
+assert condition message:
+    [ {{ condition }} ] || { echo -e 1>&2 "\n\x1b[1;41m Error \x1b[0m {{ message }}\n"; exit 1; }