diff --git a/bin/omarchy-install-battlenet b/bin/omarchy-install-battlenet index 49730d0e..fbf23033 100755 --- a/bin/omarchy-install-battlenet +++ b/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-nvidia-lib32 +omarchy-install-gpu-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. diff --git a/bin/omarchy-install-vulkan-lib32 b/bin/omarchy-install-gpu-lib32 similarity index 61% rename from bin/omarchy-install-vulkan-lib32 rename to bin/omarchy-install-gpu-lib32 index 76e4ae92..e0986764 100755 --- a/bin/omarchy-install-vulkan-lib32 +++ b/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[@]}" diff --git a/bin/omarchy-install-nvidia-lib32 b/bin/omarchy-install-nvidia-lib32 deleted file mode 100755 index ca9e4367..00000000 --- a/bin/omarchy-install-nvidia-lib32 +++ /dev/null @@ -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 diff --git a/bin/omarchy-install-steam b/bin/omarchy-install-steam index 57c3e446..871e659d 100755 --- a/bin/omarchy-install-steam +++ b/bin/omarchy-install-steam @@ -6,8 +6,7 @@ set -e omarchy-pkg-add steam -omarchy-install-vulkan-lib32 -omarchy-install-nvidia-lib32 +omarchy-install-gpu-lib32 echo "" echo "Steam will start automatically now. This might take a while..."