Merge branch 'master' into dev

Ensure master is used instead of dev as a default
Merge pull request #4314 from jmargeta/fix-legacy-mobile-nvidia-cards
2026-02-17 15:25:37 +00:00 · 2026-01-28 18:03:43 +01:00 · 2026-01-28 17:14:17 +01:00 · 2026-01-27 09:41:05 -05:00 · 2026-01-27 11:32:37 +01:00 · 2026-01-20 13:45:32 +01:00
3 changed files with 25 additions and 8 deletions
--- a/boot.sh
+++ b/boot.sh
@@ -28,12 +28,10 @@ git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/

 # Use custom branch if instructed, otherwise default to master
 OMARCHY_REF="${OMARCHY_REF:-master}"
-if [[ $OMARCHY_REF != "master" ]]; then
 echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
 cd ~/.local/share/omarchy
 git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
 cd -
-fi

 # Set edge mirror for dev installs
 if [[ $OMARCHY_REF == "dev" ]]; then
--- a/install/config/hardware/nvidia.sh
+++ b/install/config/hardware/nvidia.sh
@@ -7,8 +7,8 @@ if [ -n "$NVIDIA" ]; then
  if echo "$NVIDIA" | grep -qE "RTX [2-9][0-9]|GTX 16"; then
    # Turing (16xx, 20xx), Ampere (30xx), Ada (40xx), and newer recommend the open-source kernel modules
    PACKAGES=(nvidia-open-dkms nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
-  elif echo "$NVIDIA" | grep -qE "GTX 9|GTX 10|Quadro P"; then
-    # Pascal (10xx or Quadro Pxxx) and Maxwell (9xx) use legacy branch that can only be installed from AUR
+  elif echo "$NVIDIA" | grep -qE "GTX 9|GTX 10|Quadro P|MX1|MX2|MX3"; then
+    # Pascal (10xx, Quadro Pxxx, MX150, MX2xx, and MX3xx) and Maxwell (9xx, MX110, and MX130) use legacy branch that can only be installed from AUR
    PACKAGES=(nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils)
  fi
  # Bail if no supported GPU
--- a/migrations/1768906440.sh
+++ b/migrations/1768906440.sh
@@ -0,0 +1,19 @@
+echo "Migrate legacy mobile NVIDIA GPUs to nvidia-580xx driver (if needed)"
+
+# Only migrate MX1xx, 2xx or 3xx (Pascal/Maxwell)
+NVIDIA="$(lspci | grep -i 'nvidia')"
+if echo "$NVIDIA" | grep -qE "MX1|MX2|MX3"; then
+  if ! pacman -Qq | grep -qE '^linux(-[a-z0-9]+)?-headers$'; then
+    echo "Error: no linux headers package installed (required for DKMS drivers). Please install the appropriate headers and re-run this migration."
+    exit 1
+  fi
+
+  # Piping yes to override existing packages
+  yes | sudo pacman -S nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils
+
+  # Verify packages were installed
+  if ! pacman -Qq nvidia-580xx-dkms nvidia-580xx-utils lib32-nvidia-580xx-utils &>/dev/null; then
+    echo "Error: NVIDIA 580xx driver packages failed to install"
+    exit 1
+  fi
+fi
Author	SHA1	Message	Date
David Heinemeier Hansson	bb91f90839	Merge branch 'master' into dev	2026-01-28 18:03:43 +01:00
David Heinemeier Hansson	a7995efac2	Ensure master is used instead of dev as a default	2026-01-28 17:14:17 +01:00
Ryan Hughes	83628ab3bd	Merge pull request #4314 from jmargeta/fix-legacy-mobile-nvidia-cards Fix driver for older NVIDIA MXxxx mobile GPUs	2026-01-27 09:41:05 -05:00
Dominik	febd18ce84	Replace yq with pure bash for TOML parsing (#4171 ) * Replace yq with pure bash for TOML parsing The yq-based parsing only worked with jq/yq v3 and broke with go-yq v4. This change removes the yq and uses bash for parsing. Some additional improvments: - Handles single and double quoted values - Strips inline comments (e.g. "#hex" #comment) * Remove the no-longer-needed yq packages --------- Co-authored-by: David Heinemeier Hansson <david@hey.com>	2026-01-27 11:32:37 +01:00
Jan Margeta	5b2c0dafbf	Fix drivers for older NVIDIA MXxxx mobile GPUs Installs legacy drivers for older Pascal and Maxwell GPUs MXxx, MX2xx, MX3xx	2026-01-20 13:45:32 +01:00