Install matching kernel headers for every DKMS setup

install/hardware/apple/fix-spi-keyboard.sh

@@ -3,6 +3,7 @@ product_name="$(cat /sys/class/dmi/id/product_name 2>/dev/null)"
 if [[ $product_name =~ MacBook[89],1|MacBook1[02],1|MacBookPro13,[123]|MacBookPro14,[123] ]]; then
   echo "Detected MacBook with SPI keyboard"
 
+  omarchy-pkg-add-kernel-headers
   omarchy-pkg-add macbook12-spi-driver-dkms
   sudo mkdir -p /etc/mkinitcpio.conf.d
   if [[ $product_name == "MacBook8,1" ]]; then

install/hardware/fix-bcm43xx.sh

@@ -6,5 +6,6 @@ pci_info=$(lspci -nn)
 
 if (echo "$pci_info" | grep -q "14e4:43a0" || echo "$pci_info" | grep -q "14e4:4331"); then
   echo "BCM4360 / BCM4331 detected"
-  omarchy-pkg-add broadcom-wl-dkms linux-omarchy-headers
+  omarchy-pkg-add-kernel-headers
+  omarchy-pkg-add broadcom-wl-dkms
 fi

install/hardware/fix-elgato-camlink-4k.sh

@@ -4,8 +4,8 @@
 # v4l2-relayd re-exposes it at 1280x720 under the same name.
 
 if omarchy-hw-elgato-camlink-4k; then
-  mapfile -t kernel_headers < <(pacman -Qqs '^linux(-zen|-lts|-hardened|-t2|-ptl|-omarchy(-bore|-ptl-novrr-mm)?)?$' | sed 's/$/-headers/')
-  omarchy-pkg-add "${kernel_headers[@]}" v4l2loopback-dkms v4l2loopback-utils v4l2-relayd
+  omarchy-pkg-add-kernel-headers
+  omarchy-pkg-add v4l2loopback-dkms v4l2loopback-utils v4l2-relayd
 
   sudo install -Dm644 "$OMARCHY_PATH/default/udev/elgato-camlink-4k.rules" /etc/udev/rules.d/71-elgato-camlink-4k.rules
   sudo install -Dm644 "$OMARCHY_PATH/default/v4l2-relayd/camlink.conf" /etc/v4l2-relayd.d/camlink.conf

install/hardware/fix-tuxedo-backlight.sh

@@ -1,7 +1,8 @@
 # Install Tuxedo drivers for keyboard backlighting on Tuxedo laptops and
 # compatible devices like the Slimbook Executive (Clevo/Tuxedo chassis).
 if cat /sys/class/dmi/id/sys_vendor 2>/dev/null | grep -qi "TUXEDO\|Slimbook"; then
-  omarchy-pkg-add linux-omarchy-headers tuxedo-drivers-nocompatcheck-dkms
+  omarchy-pkg-add-kernel-headers
+  omarchy-pkg-add tuxedo-drivers-nocompatcheck-dkms
 
   # Blacklist the legacy clevo_xsm_wmi module which conflicts with the tuxedo-drivers
   # clevo_wmi module. When clevo_xsm_wmi loads first, it grabs the Clevo WMI GUIDs,

install/hardware/fix-yt6801-ethernet-adapter.sh

@@ -1,4 +1,5 @@
 # Install drivers for Motorcomm YT6801 ethernet adapter used by the Slimbook Executive
 if lspci | grep -i "YT6801\|Motorcomm.*Ethernet"; then
-  omarchy-pkg-add linux-omarchy-headers yt6801-dkms
+  omarchy-pkg-add-kernel-headers
+  omarchy-pkg-add yt6801-dkms
 fi

install/hardware/intel/ipu7-camera.sh

@@ -1,5 +1,6 @@
 # Install MIPI camera support for Intel IPU7 hardware
 
 if grep -q "OVTI08F4" /sys/bus/acpi/devices/*/hid 2>/dev/null; then
+  omarchy-pkg-add-kernel-headers
   omarchy-pkg-add intel-ipu7-camera
 fi

install/hardware/nvidia.sh

@@ -1,8 +1,4 @@
 if lspci | grep -qi 'nvidia'; then
-  # Check which kernel is installed and set appropriate headers package
-  KERNEL_PACKAGE=$(pacman -Qqs '^linux(-zen|-lts|-hardened|-t2|-ptl|-omarchy(-bore|-ptl-novrr-mm)?)?$' | head -1 || true)
-  [[ -n $KERNEL_PACKAGE ]] && omarchy-pkg-add "$KERNEL_PACKAGE-headers"
-
   if omarchy-hw-nvidia-gsp; then
     PACKAGES=(nvidia-open-dkms nvidia-utils lib32-nvidia-utils libva-nvidia-driver)
   elif omarchy-hw-nvidia-without-gsp; then
@@ -15,6 +11,7 @@ if lspci | grep -qi 'nvidia'; then
     exit 0
   fi
 
+  omarchy-pkg-add-kernel-headers
   omarchy-pkg-add "${PACKAGES[@]}"
 
   # Per-session Hyprland NVIDIA env vars are handled by default/hypr/nvidia.lua.

install/omarchy-other.packages

@@ -20,9 +20,7 @@ libva-nvidia-driver
 limine
 limine-mkinitcpio-hook
 limine-snapper-sync
-linux
 linux-firmware
-linux-headers
 linux-omarchy
 linux-omarchy-headers
 macbook12-spi-driver-dkms