From e294394b8a16375b7692be9f7be1e65c81c44680 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 15 Mar 2026 19:11:41 +0100
Subject: [PATCH] Add npx wrapper installer for packages moving too fast for
 normal repos

They're lazy loaded too. So we don't need manual install from a menu.
---
 bin/omarchy-menu              |  7 +------
 bin/omarchy-npx-install       | 22 ++++++++++++++++++++++
 install/omarchy-base.packages |  2 --
 install/packaging/all.sh      |  1 +
 install/packaging/npx.sh      |  6 ++++++
 migrations/1773598247.sh      |  3 +++
 6 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100755 bin/omarchy-npx-install
 create mode 100755 install/packaging/npx.sh
 create mode 100644 migrations/1773598247.sh

diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 11ead83d..05256313 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -355,13 +355,8 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "  Dictation\n󱚤  Claude Code\n󱚤  Codex\n󱚤  Gemini CLI\n󱚤  Copilot CLI\n󱚤  Cursor CLI\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
+  case $(menu "Install" "  Dictation\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush") in
   *Dictation*) present_terminal omarchy-voxtype-install ;;
-  *Claude*) install "Claude Code" "claude-code" ;;
-  *Codex*) install "Codex" "openai-codex" ;;
-  *Gemini*) install "Gemini CLI" "gemini-cli" ;;
-  *Copilot*) install "Copilot CLI" "github-copilot-cli" ;;
-  *Cursor*) install "Cursor CLI" "cursor-cli" ;;
   *Studio*) install "LM Studio" "lmstudio-bin" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
   *Crush*) install "Crush" "crush-bin" ;;
diff --git a/bin/omarchy-npx-install b/bin/omarchy-npx-install
new file mode 100755
index 00000000..a3a7113a
--- /dev/null
+++ b/bin/omarchy-npx-install
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Install an npx wrapper for a given npm package.
+# Usage: omarchy-npx-install <package> [command-name]
+#
+# If command-name is omitted, it defaults to the package name.
+# Example: omarchy-npx-install opencode-ai opencode
+
+if [[ -z $1 ]]; then
+  echo "Usage: omarchy-npx-install <package> [command-name]"
+  exit 1
+fi
+
+package=$1
+command=${2:-$1}
+
+cat > "$HOME/.local/bin/$command" <<EOF
+#!/bin/bash
+exec npx --yes $package "\$@"
+EOF
+
+chmod +x "$HOME/.local/bin/$command"
diff --git a/install/omarchy-base.packages b/install/omarchy-base.packages
index ebcddb72..a8f31798 100644
--- a/install/omarchy-base.packages
+++ b/install/omarchy-base.packages
@@ -16,7 +16,6 @@ brightnessctl
 btop
 chromium
 clang
-claude-code
 cups
 cups-browsed
 cups-filters
@@ -92,7 +91,6 @@ obs-studio
 obsidian
 omarchy-nvim
 omarchy-walker
-opencode
 pamixer
 pinta
 playerctl
diff --git a/install/packaging/all.sh b/install/packaging/all.sh
index 16e6404a..4419e23a 100644
--- a/install/packaging/all.sh
+++ b/install/packaging/all.sh
@@ -4,6 +4,7 @@ run_logged $OMARCHY_INSTALL/packaging/nvim.sh
 run_logged $OMARCHY_INSTALL/packaging/icons.sh
 run_logged $OMARCHY_INSTALL/packaging/webapps.sh
 run_logged $OMARCHY_INSTALL/packaging/tuis.sh
+run_logged $OMARCHY_INSTALL/packaging/npx.sh
 run_logged $OMARCHY_INSTALL/packaging/asus-rog.sh
 run_logged $OMARCHY_INSTALL/packaging/framework16.sh
 run_logged $OMARCHY_INSTALL/packaging/surface.sh
diff --git a/install/packaging/npx.sh b/install/packaging/npx.sh
new file mode 100755
index 00000000..677f9cd5
--- /dev/null
+++ b/install/packaging/npx.sh
@@ -0,0 +1,6 @@
+omarchy-npx-install @anthropic-ai/claude-code claude
+omarchy-npx-install @openai/codex codex
+omarchy-npx-install @google/gemini-cli gemini
+omarchy-npx-install @github/copilot copilot
+omarchy-npx-install opencode-ai opencode
+omarchy-npx-install playwright-cli
diff --git a/migrations/1773598247.sh b/migrations/1773598247.sh
new file mode 100644
index 00000000..5a57a07c
--- /dev/null
+++ b/migrations/1773598247.sh
@@ -0,0 +1,3 @@
+echo "Install npx wrappers for AI CLI tools and playwright"
+
+source "$OMARCHY_PATH/install/packaging/npx.sh"