Merge branch 'dev' into rc

bin/omarchy-install-battlenet

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# omarchy:summary=Install Battle.net via Lutris (Wine + DXVK handled by the Lutris install recipe)
+# omarchy:requires-sudo=true
+
+set -e
+
+omarchy-pkg-add lutris wine-staging wine-mono wine-gecko winetricks python-protobuf
+omarchy-install-vulkan-lib32
+omarchy-install-nvidia-lib32
+
+# Lutris ships with `#!/usr/bin/env python3`, which resolves to mise's Python and
+# fails to import the lutris module. Pin the shebang to the system Python.
+sudo sed -i '/env python3/ c\#!/bin/python3' /usr/bin/lutris
+
+echo ""
+echo "Lutris will open the Battle.net installer. Click Install and follow the prompts."
+
+setsid lutris lutris:install/battlenet >/dev/null 2>&1 &

bin/omarchy-install-nvidia-lib32

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# omarchy:summary=Install the lib32 NVIDIA driver matching the detected GPU generation (no-op if no NVIDIA).
+# omarchy:requires-sudo=true
+
+set -e
+
+if omarchy-hw-nvidia-gsp; then
+  omarchy-pkg-add lib32-nvidia-utils
+elif omarchy-hw-nvidia-without-gsp; then
+  omarchy-pkg-add lib32-nvidia-580xx-utils
+fi

bin/omarchy-install-steam

@@ -5,26 +5,9 @@
 
 set -e
 
-PACKAGES=(steam)
+omarchy-pkg-add steam
-
+omarchy-install-vulkan-lib32
-# Pick the lib32 vulkan provider matching detected GPU(s) so pacman doesn't prompt.
+omarchy-install-nvidia-lib32
-if omarchy-hw-nvidia-gsp; then
-  PACKAGES+=(lib32-nvidia-utils)
-elif omarchy-hw-nvidia-without-gsp; then
-  PACKAGES+=(lib32-nvidia-580xx-utils)
-fi
-
-declare -A VULKAN_DRIVERS=(
-  [Intel]=lib32-vulkan-intel
-  [AMD]=lib32-vulkan-radeon
-)
-for vendor in "${!VULKAN_DRIVERS[@]}"; do
-  if lspci | grep -iE "(VGA|Display).*$vendor" >/dev/null; then
-    PACKAGES+=("${VULKAN_DRIVERS[$vendor]}")
-  fi
-done
-
-omarchy-pkg-add "${PACKAGES[@]}"
 
 echo ""
 echo "Steam will start automatically now. This might take a while..."

bin/omarchy-install-vulkan-lib32

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# omarchy:summary=Install lib32 Vulkan drivers for any detected Intel/AMD GPUs (no-op otherwise).
+# omarchy:requires-sudo=true
+
+set -e
+
+PACKAGES=()
+
+declare -A VULKAN_DRIVERS=(
+  [Intel]=lib32-vulkan-intel
+  [AMD]=lib32-vulkan-radeon
+)
+for vendor in "${!VULKAN_DRIVERS[@]}"; do
+  if lspci | grep -iE "(VGA|Display).*$vendor" >/dev/null; then
+    PACKAGES+=("${VULKAN_DRIVERS[$vendor]}")
+  fi
+done
+
+[[ ${#PACKAGES[@]} -gt 0 ]] && omarchy-pkg-add "${PACKAGES[@]}"

bin/omarchy-menu

@@ -386,10 +386,11 @@ show_install_ai_menu() {
 }
 
 show_install_gaming_menu() {
-  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft\n󰢹  NVIDIA GeForce NOW\n󰖺  Xbox Controller [AUR]") in
+  case $(menu "Install" "  Steam\n  RetroArch\n󰍳  Minecraft\n  Battle.net\n󰢹  NVIDIA GeForce NOW\n󰖺  Xbox Controller [AUR]") in
   *Steam*) present_terminal omarchy-install-steam ;;
   *RetroArch*) present_terminal omarchy-install-retroarch ;;
   *Minecraft*) install_and_launch "Minecraft" "minecraft-launcher" "minecraft-launcher" ;;
+  *Battle.net*) present_terminal omarchy-install-battlenet ;;
   *GeForce*) present_terminal omarchy-install-geforce-now ;;
   *Xbox*) present_terminal omarchy-install-xbox-controllers ;;
   *) show_install_menu ;;