diff --git a/justfile b/justfile
index 1f8f1b1..2daa94d 100644
--- a/justfile
+++ b/justfile
@@ -16,7 +16,16 @@ export NIX_PATH := `echo "${NIX_PATH_ORIG:-"${NIX_PATH:-}"}"`
 # required programs: git nix nom gum fzf tee nix-update
 
 @_default:
-    cd "$invokedir"; just "$(gum filter $(just --summary --unsorted))"
+    cd "$invokedir"; just "$(gum filter $(just --summary --unsorted | tr ' ' '\n' | grep -vxE 'commit|fixup|list|build'))"
+@commit *args:
+    cd "$invokedir"; just "$(gum filter $(just --summary --unsorted | tr ' ' '\n' | grep '^commit-'))" "$@"
+@fixup *args:
+    cd "$invokedir"; just "$(gum filter $(just --summary --unsorted | tr ' ' '\n' | grep '^fixup-'))" "$@"
+@list *args:
+@instantiate *args:
+    cd "$invokedir"; just "$(gum filter $(just --summary --unsorted | tr ' ' '\n' | grep '^instantiate-'))" "$@"
+@build *args:
+    cd "$invokedir"; just "$(gum filter $(just --summary --unsorted | tr ' ' '\n' | grep '^build-'))" "$@"
 
 # === info helpers ===