From 3ea45aa995299812a49e75b35552461fbf59965a Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 31 Aug 2025 14:54:44 +0200
Subject: [PATCH] Convert most of the optional AUR dependencies over to OPR

---
 bin/omarchy-install-dev-env |  2 +-
 bin/omarchy-install-dropbox |  6 ++----
 bin/omarchy-menu            | 14 +++++++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/bin/omarchy-install-dev-env b/bin/omarchy-install-dev-env
index 1865992..bd189b2 100755
--- a/bin/omarchy-install-dev-env
+++ b/bin/omarchy-install-dev-env
@@ -75,7 +75,7 @@ laravel)
 symfony)
   echo -e "Installing PHP and Symfony...\n"
   install_php
-  yay -S symfony-cli --noconfirm
+  omarchy-pkg-add symfony-cli
   echo -e "\nYou can now run: symfony new --webapp myproject"
   ;;
 python)
diff --git a/bin/omarchy-install-dropbox b/bin/omarchy-install-dropbox
index e80982d..ac5710c 100755
--- a/bin/omarchy-install-dropbox
+++ b/bin/omarchy-install-dropbox
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-# FIXME: Should not use AUR dependencies when we can avoid it
-echo "Installing all dependencies [from AUR]..."
-yay -S --noconfirm --needed \
-  dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
+echo "Installing all dependencies..."
+omarchy-pkg-add dropbox dropbox-cli libappindicator-gtk3 python-gpgme nautilus-dropbox
 
 echo "Starting Dropbox..."
 uwsm app -- dropbox-cli start &>/dev/null &
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index d2cf322..7cbbbad 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -209,9 +209,9 @@ show_install_service_menu() {
 }
 
 show_install_editor_menu() {
-  case $(menu "Install" "  VSCode\n  Cursor [AUR]\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
+  case $(menu "Install" "  VSCode\n  Cursor\n  Zed\n  Sublime Text\n  Helix\n  Emacs") in
   *VSCode*) install_and_launch "VSCode" "visual-studio-code-bin" "code" ;;
-  *Cursor*) aur_install_and_launch "Cursor" "cursor-bin" "cursor" ;;
+  *Cursor*) install_and_launch "Cursor" "cursor-bin" "cursor" ;;
   *Zed*) install_and_launch "Zed" "zed" "dev.zed.Zed" ;;
   *Sublime*) install_and_launch "Sublime Text" "sublime-text-4" "sublime_text" ;;
   *Helix*) install "Helix" "helix" ;;
@@ -227,14 +227,14 @@ show_install_ai_menu() {
       echo ollama
   )
 
-  case $(menu "Install" "󱚤  Claude Code [AUR]\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio [AUR]\n󱚤  Ollama\n󱚤  Crush [AUR]\n󱚤  opencode [AUR]") in
-  *Claude*) aur_install "Claude Code" "claude-code" ;;
+  case $(menu "Install" "󱚤  Claude Code\n󱚤  Gemini\n󱚤  OpenAI Codex [AUR]\n󱚤  LM Studio\n󱚤  Ollama\n󱚤  Crush\n󱚤  opencode") in
+  *Claude*) install "Claude Code" "claude-code" ;;
   *OpenAI*) aur_install "OpenAI Codex" "openai-codex-bin" ;;
   *Gemini*) install "Gemini" "gemini-cli" ;;
-  *Studio*) aur_install "LM Studio" "lmstudio" ;;
+  *Studio*) install "LM Studio" "lmstudio" ;;
   *Ollama*) install "Ollama" $ollama_pkg ;;
-  *Crush*) aur_install "Crush" "crush-bin" ;;
-  *opencode*) aur_install "opencode" "opencode-bin" ;;
+  *Crush*) install "Crush" "crush-bin" ;;
+  *opencode*) install "opencode" "opencode-bin" ;;
   *) show_install_menu ;;
   esac
 }