Collapse installer together

bin/omarchy-install-battlenet

@@ -6,8 +6,7 @@
 set -e
 
 omarchy-pkg-add lutris umu-launcher wine-staging wine-mono wine-gecko winetricks python-protobuf
-omarchy-install-vulkan-lib32
+omarchy-install-gpu-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.

bin/omarchy-install-gpu-lib32

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# omarchy:summary=Install lib32 Vulkan drivers for any detected Intel/AMD GPUs (no-op otherwise).
+# omarchy:summary=Install lib32 graphics drivers (Vulkan + NVIDIA) for any detected GPUs.
 # omarchy:requires-sudo=true
 
 set -e
@@ -17,4 +17,10 @@ for vendor in "${!VULKAN_DRIVERS[@]}"; do
   fi
 done
 
+if omarchy-hw-nvidia-gsp; then
+  PACKAGES+=(lib32-nvidia-utils)
+elif omarchy-hw-nvidia-without-gsp; then
+  PACKAGES+=(lib32-nvidia-580xx-utils)
+fi
+
 [[ ${#PACKAGES[@]} -gt 0 ]] && omarchy-pkg-add "${PACKAGES[@]}"

bin/omarchy-install-nvidia-lib32

@@ -1,12 +0,0 @@
-#!/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

@@ -6,8 +6,7 @@
 set -e
 
 omarchy-pkg-add steam
-omarchy-install-vulkan-lib32
+omarchy-install-gpu-lib32
-omarchy-install-nvidia-lib32
 
 echo ""
 echo "Steam will start automatically now. This might take a while..."