diff --git a/scripts/setup.sh b/scripts/setup.sh
index d59a4e4..4a7ec34 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -18,6 +18,29 @@ else
     exit 1
 fi
 
+# Install Homebrew on macOS
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    echo ""
+    echo "🍺 Checking for Homebrew..."
+    if command -v brew &> /dev/null; then
+        echo "✓ Homebrew is already installed"
+    else
+        echo "📦 Installing Homebrew..."
+        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+        echo "✓ Homebrew installed"
+    fi
+
+    echo ""
+    echo "📦 Checking for Git..."
+    if command -v git &> /dev/null; then
+        echo "✓ Git is already installed"
+    else
+        echo "📦 Installing Git via Homebrew..."
+        brew install git
+        echo "✓ Git installed"
+    fi
+fi
+
 # Install NVM
 echo ""
 echo "📦 Installing NVM (Node Version Manager)..."
@@ -50,11 +73,25 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr
 
 # Install Node.js 20
 echo ""
-echo "📦 Installing Node.js 20..."
-nvm install 20
-nvm use 20
-nvm alias default 20
-echo "✓ Node.js 20 installed and set as default"
+echo "📦 Checking for Node.js 20..."
+if command -v node &> /dev/null; then
+    NODE_VERSION=$(node --version | cut -d'v' -f2 | cut -d'.' -f1)
+    if [ "$NODE_VERSION" -eq 20 ]; then
+        echo "✓ Node.js 20 is already installed"
+    else
+        echo "📦 Installing Node.js 20..."
+        nvm install 20
+        nvm use 20
+        nvm alias default 20
+        echo "✓ Node.js 20 installed and set as default"
+    fi
+else
+    echo "📦 Installing Node.js 20..."
+    nvm install 20
+    nvm use 20
+    nvm alias default 20
+    echo "✓ Node.js 20 installed and set as default"
+fi
 
 # Install Bun
 echo ""
@@ -66,6 +103,17 @@ else
     echo "✓ Bun installed"
 fi
 
+# Install Claude Code
+echo ""
+echo "🤖 Checking for Claude Code..."
+if command -v claude &> /dev/null; then
+    echo "✓ Claude Code is already installed"
+else
+    echo "📦 Installing Claude Code..."
+    npm install -g @anthropic-ai/claude-code
+    echo "✓ Claude Code installed"
+fi
+
 # Install project dependencies
 echo ""
 echo "📦 Installing project dependencies..."
@@ -82,4 +130,4 @@ echo ""
 echo "Next steps:"
 echo "1. Restart your terminal or run: source ~/.zshrc"
 echo "2. Verify installation: node --version && bun --version"
-echo "3. Start development: bun run dev"
\ No newline at end of file
+echo "3. Start development: bun run dev"