diff --git a/.envrc b/.envrc
index 3550a30..0568783 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,3 @@
+dotenv_if_exists
+
 use flake
diff --git a/Justfile b/Justfile
index 20e9559..f059fdf 100644
--- a/Justfile
+++ b/Justfile
@@ -1,11 +1,19 @@
-build:
-  nixos-rebuild --flake .# build
+set dotenv-load
+
+default:
+    @just --choose
+
+build machine="":
+    nixos-rebuild --flake .#{{machine}} build
 
 diff:
-  nvd diff /run/current-system ./result
+    nvd diff /run/current-system ./result
 
-switch:
-  nixos-rebuild --flake .# --use-remote-sudo switch
+switch machine="":
+    nixos-rebuild --flake .#{{machine}} --use-remote-sudo switch
 
-deploy HOST:
-    nix run ".#apps.nixinate.{{HOST}}"
+fmt:
+    nix fmt
+
+deploy host:
+    nix run ".#apps.nixinate.{{host}}"