From 19d1ee2b00e009c13ed89f7a3b125a1b93ab1c22 Mon Sep 17 00:00:00 2001
From: Michael Larsen <michaelarsen@gmail.com>
Date: Thu, 18 Sep 2025 13:01:26 +0200
Subject: [PATCH 1/5] Added fix for ealy 2013 macbook pro's using an older
 chipset, BCM4331

---
 .../hardware/{fix-apple-bcm4360.sh => fix-apple-bcm43xx.sh}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename install/config/hardware/{fix-apple-bcm4360.sh => fix-apple-bcm43xx.sh} (100%)

diff --git a/install/config/hardware/fix-apple-bcm4360.sh b/install/config/hardware/fix-apple-bcm43xx.sh
similarity index 100%
rename from install/config/hardware/fix-apple-bcm4360.sh
rename to install/config/hardware/fix-apple-bcm43xx.sh

From ad30ef6339be16bc3c5d0824e140aa9741943af9 Mon Sep 17 00:00:00 2001
From: Michael Larsen <michaelarsen@gmail.com>
Date: Thu, 18 Sep 2025 14:53:04 +0200
Subject: [PATCH 2/5] Tried with a different approach for cleaner code

---
 install/config/hardware/fix-apple-bcm43xx.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/install/config/hardware/fix-apple-bcm43xx.sh b/install/config/hardware/fix-apple-bcm43xx.sh
index f7d6d324..17a57d87 100644
--- a/install/config/hardware/fix-apple-bcm43xx.sh
+++ b/install/config/hardware/fix-apple-bcm43xx.sh
@@ -1,5 +1,16 @@
-# Install wifi drivers for 2013-2015 MacBooks using the BCM4360 chip
-if lspci -nnv | grep -A2 "14e4:43a0" | grep -q "106b:"; then
+# Install Wi-Fi drivers for Broadcom chips on MacBooks:
+# - BCM4360 (2013–2015)
+# - BCM4331 (2012, early 2013)
+
+# Grab the PCI ID string once
+pci_info=$(lspci -nnv)
+
+if echo "$pci_info" | grep -q "14e4:43a0" && echo "$pci_info" | grep -q "106b:"; then
   echo "Apple BCM4360 detected"
-  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
+#  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
+elif echo "$pci_info" | grep -q "14e4:4331" && echo "$pci_info" | grep -q "106b:"; then
+  echo "Apple BCM4331 detected"
+#  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
+else
+  echo "No supported Broadcom chip detected"
 fi

From 4d50c8bd336b898efc2cf5f6fb4c194d05fb0bc8 Mon Sep 17 00:00:00 2001
From: Michael Larsen <michaelarsen@gmail.com>
Date: Thu, 18 Sep 2025 15:16:24 +0200
Subject: [PATCH 3/5] Clean up

Tested the logic on the MacBook. It worked and the install of the
drivers are reenabled.
---
 install/config/hardware/fix-apple-bcm43xx.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/install/config/hardware/fix-apple-bcm43xx.sh b/install/config/hardware/fix-apple-bcm43xx.sh
index 17a57d87..1a479991 100644
--- a/install/config/hardware/fix-apple-bcm43xx.sh
+++ b/install/config/hardware/fix-apple-bcm43xx.sh
@@ -7,10 +7,8 @@ pci_info=$(lspci -nnv)
 
 if echo "$pci_info" | grep -q "14e4:43a0" && echo "$pci_info" | grep -q "106b:"; then
   echo "Apple BCM4360 detected"
-#  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
+  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
 elif echo "$pci_info" | grep -q "14e4:4331" && echo "$pci_info" | grep -q "106b:"; then
   echo "Apple BCM4331 detected"
-#  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
-else
-  echo "No supported Broadcom chip detected"
+  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
 fi

From 607915a5d1338cf2118b75b4a704abb0d3bf68c6 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Sun, 21 Sep 2025 18:12:21 -0400
Subject: [PATCH 4/5] Combine ifs

---
 install/config/hardware/fix-apple-bcm43xx.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/install/config/hardware/fix-apple-bcm43xx.sh b/install/config/hardware/fix-apple-bcm43xx.sh
index 1a479991..1311a491 100644
--- a/install/config/hardware/fix-apple-bcm43xx.sh
+++ b/install/config/hardware/fix-apple-bcm43xx.sh
@@ -2,13 +2,10 @@
 # - BCM4360 (2013–2015)
 # - BCM4331 (2012, early 2013)
 
-# Grab the PCI ID string once
 pci_info=$(lspci -nnv)
 
-if echo "$pci_info" | grep -q "14e4:43a0" && echo "$pci_info" | grep -q "106b:"; then
-  echo "Apple BCM4360 detected"
-  sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
-elif echo "$pci_info" | grep -q "14e4:4331" && echo "$pci_info" | grep -q "106b:"; then
-  echo "Apple BCM4331 detected"
+if echo "$pci_info" | grep -q "106b:" && 
+  (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then
+  echo "Apple BCM4360 / BCM4331 detected"
   sudo pacman -S --noconfirm --needed broadcom-wl dkms linux-headers
 fi

From 971422b757d9a748e269b53f76cb63bacad26be8 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Sun, 28 Sep 2025 15:02:54 -0400
Subject: [PATCH 5/5] Update install script name

---
 install/config/all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/config/all.sh b/install/config/all.sh
index 1336dee3..a9affb79 100644
--- a/install/config/all.sh
+++ b/install/config/all.sh
@@ -24,6 +24,6 @@ run_logged $OMARCHY_INSTALL/config/hardware/usb-autosuspend.sh
 run_logged $OMARCHY_INSTALL/config/hardware/ignore-power-button.sh
 run_logged $OMARCHY_INSTALL/config/hardware/nvidia.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-f13-amd-audio-input.sh
-run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm4360.sh
+run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-bcm43xx.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-spi-keyboard.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-apple-t2.sh