diff --git a/configuration.nix b/configuration.nix
index 7bb0404..4f03b4a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -30,6 +30,12 @@
     direnv
   ];
 
+  # Add ~/.local/bin and /usr/local/bin to PATH for manually installed tools
+  environment.localBinInPath = true;
+  environment.shellInit = ''
+    export PATH="/usr/local/bin:$PATH"
+  '';
+
   # Enable Nix flakes
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
diff --git a/scripts/learner-add.sh b/scripts/learner-add.sh
index 664c042..f4ed765 100755
--- a/scripts/learner-add.sh
+++ b/scripts/learner-add.sh
@@ -84,6 +84,12 @@ create_user() {
     echo '# Slack bot development tokens' >> "/home/$username/.bashrc"
     echo 'source /etc/slack-learner.env' >> "/home/$username/.bashrc"
 
+    # Set up ~/.local/bin with claude symlink
+    local local_bin="/home/$username/.local/bin"
+    mkdir -p "$local_bin"
+    ln -sf /usr/local/bin/claude "$local_bin/claude"
+    chown -R "$username:users" "/home/$username/.local"
+
     log_info "User created with SSH access"
 }