diff --git a/CLAUDE.md b/CLAUDE.md
index b17a289..6639a57 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -183,3 +183,5 @@ labmcp/
 - Use `database/sql` interface for database abstraction
 - File paths in responses should use format `path/to/file.go:123`
 - **Always run `go fmt ./...` before committing Go code**
+- **Run Go commands using `nix develop -c`** (e.g., `nix develop -c go test ./...`) to ensure proper build environment with all dependencies
+- **Use `nix run` to run binaries** instead of `go build` followed by running the binary (e.g., `nix run .#nixos-options -- serve`)