From ec0bcb3014fa90037d3049cbeb432bac515913fd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 3 May 2026 21:35:02 +0200
Subject: [PATCH] Better retroarch install with config setup and no AUR

---
 bin/omarchy-install-retroarch | 32 ++++++++++++++++++++++++++++----
 bin/omarchy-menu              |  4 ++--
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/bin/omarchy-install-retroarch b/bin/omarchy-install-retroarch
index fa5b3c4f..76e976bc 100755
--- a/bin/omarchy-install-retroarch
+++ b/bin/omarchy-install-retroarch
@@ -4,10 +4,26 @@
 
 set -e
 
-omarchy-pkg-aur-add retroarch retroarch-assets libretro libretro-fbneo
+omarchy-pkg-add \
+  retroarch \
+  retroarch-assets-glui retroarch-assets-ozone retroarch-assets-xmb \
+  libretro-beetle-pce libretro-beetle-pce-fast libretro-beetle-psx libretro-beetle-psx-hw libretro-beetle-supergrafx \
+  libretro-blastem \
+  libretro-bsnes libretro-bsnes-hd libretro-bsnes2014 \
+  libretro-core-info \
+  libretro-desmume libretro-dolphin libretro-flycast \
+  libretro-gambatte libretro-genesis-plus-gx \
+  libretro-kronos \
+  libretro-mame libretro-mame2016 libretro-melonds libretro-mesen libretro-mesen-s libretro-mgba libretro-mupen64plus-next \
+  libretro-nestopia \
+  libretro-overlays \
+  libretro-parallel-n64 libretro-picodrive libretro-play libretro-ppsspp \
+  libretro-sameboy libretro-scummvm libretro-shaders-slang libretro-snes9x \
+  libretro-yabause \
+  libretro-fbneo-git
 
-# Set up ~/Games as the default ROM directory
-mkdir -p "$HOME/Games"
+# Set up ~/Games for BIOS files and ROMs
+mkdir -p "$HOME/Games/bios" "$HOME/Games/roms"
 
 CFG="$HOME/.config/retroarch/retroarch.cfg"
 mkdir -p "$(dirname "$CFG")"
@@ -22,6 +38,14 @@ set_cfg() {
   fi
 }
 
-set_cfg rgui_browser_directory "$HOME/Games"
+set_cfg rgui_browser_directory "$HOME/Games/roms"
+set_cfg system_directory "$HOME/Games/bios"
+
+# Point at the cores and assets installed by pacman
+set_cfg libretro_directory "/usr/lib/libretro"
+set_cfg libretro_info_path "/usr/share/libretro/info"
+set_cfg overlay_directory "/usr/share/libretro/overlays"
+set_cfg osk_overlay_directory "/usr/share/libretro/overlays/keyboards"
+set_cfg video_shader_dir "/usr/share/libretro/shaders/shaders_slang"
 
 setsid gtk-launch com.libretro.RetroArch.desktop >/dev/null 2>&1 &
diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 343d2794..9933b5da 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -386,11 +386,11 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n󰢹  NVIDIA GeForce NOW\n  RetroArch [AUR]\n󰍳  Minecraft\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft\n󰢹  NVIDIA GeForce NOW\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
-  *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *RetroArch*) present_terminal omarchy-install-retroarch ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
+  *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;
   esac