diff --git a/Justfile b/Justfile
new file mode 100644
index 0000000..b8600fc
--- /dev/null
+++ b/Justfile
@@ -0,0 +1,35 @@
+# List all commands
+default:
+    @just --list
+
+# Rebuild current macOS host (auto-detect from hostname)
+[macos]
+darwin:
+    #!/usr/bin/env bash
+    attr=$(scutil --get LocalHostName | tr '[:upper:]' '[:lower:]' | sed 's/awesome-//')
+    sudo darwin-rebuild switch --flake .#"$attr"
+
+# Rebuild WSL host
+[linux]
+nixos:
+    sudo nixos-rebuild switch --flake .#wsl
+
+# Update all flake inputs
+update:
+    nix flake update
+
+# Edit encrypted secrets
+secrets:
+    sops secrets/secrets.yaml
+
+# Garbage-collect old generations
+gc:
+    nix-collect-garbage -d
+
+# Show flake outputs
+show:
+    nix flake show
+
+# Check flake for errors
+check:
+    nix flake check --no-build
diff --git a/home/default.nix b/home/default.nix
index ef8ef7e..5dabbd7 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -44,6 +44,7 @@
     nix-output-monitor # nom
     nvd # nix version diff
     nh # nix helper
+    just
 
     # Secrets management
     sops