diff --git a/AGENTS.md b/AGENTS.md
index a5b8663..6ea5994 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -8,6 +8,7 @@ This file provides guidelines for AI coding agents operating within this reposit
 - **Local VM**: `make vm` (Starts local VM that simulates USB environment)
 - **Test**: `make status-cloud` (Health checks for cloud infrastructure)
 - **Deploy**: `make deploy-cloud` (Deploys 15 VMs to Hetzner Cloud)
+- **Format**: `make format` (Format Nix files)
 
 ## Code Style Guidelines
 
diff --git a/Makefile b/Makefile
index 7bced67..4ccd6cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 -include .env
 export
 
-.PHONY: help deploy-cloud build-usb flash-usb vm-run vm-build clean status destroy-cloud opencode lint
+.PHONY: help deploy-cloud build-usb flash-usb vm-run vm-build clean status destroy-cloud opencode format
 
 DOMAIN := $(or $(WORKSHOP_DOMAIN),codecrispi.es)
 USB_DEVICE := $(or $(USB_DEVICE),/dev/sdX)
@@ -27,7 +27,7 @@ help:
 	@echo ""
 	@echo "⚙️ Development:"
 	@echo "  make opencode        - Start opencode in dev shell"
-	@echo "  make lint            - Run linting checks"
+	@echo "  make format          - Format Nix files"
 	@echo ""
 	@echo "Current Config:"
 	@echo "  Domain: $(DOMAIN)"
@@ -113,11 +113,6 @@ clean:
 opencode:
 	nix develop --command opencode
 
-lint:
-	@echo "🔍 Linting project files..."
-	@nix develop -c markdownlint-cli . || true
-	@nix develop -c nixpkgs-fmt --check . || true
-
-lint-fix:
-	@echo "🎨 Formatting Nix files..."
-	@nix develop -c nixpkgs-fmt .
+format:
+	@echo "🔍 Formatting Nix files..."
+	@nix run nixpkgs#nixfmt-rfc-style *.nix
diff --git a/README.md b/README.md
index e94f9f6..ad7e704 100644
--- a/README.md
+++ b/README.md
@@ -151,6 +151,16 @@ connect <TAB>              # Shows all available servers
 - HCLOUD_TOKEN for cloud deployment
 - 2GB+ RAM for VM testing
 
+## 🛠️ Development Tools
+
+```bash
+# Format Nix files
+make format         # Format Nix files
+
+# Start development environment
+make opencode       # Start opencode in dev shell
+```
+
 ## 🧹 Cleanup
 
 ```bash