Make linux-omarchy the default kernel except on T2 Macs

install/hardware/all.sh

@@ -1,3 +1,5 @@
+run_logged "$OMARCHY_INSTALL/hardware/kernel.sh"
+
 run_logged "$OMARCHY_INSTALL/hardware/asus-rog.sh"
 run_logged "$OMARCHY_INSTALL/hardware/framework16.sh"
 run_logged "$OMARCHY_INSTALL/hardware/dell-xps-touchpad-haptics.sh"
@@ -14,21 +16,14 @@ run_logged "$OMARCHY_INSTALL/hardware/vulkan.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/video-acceleration.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/lpmd.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/thermald.sh"
-# Swap in the Panther Lake kernel before anything pulls DKMS modules in.
-# intel-ipu7-camera drags in ipu7-drivers, vision-drivers and v4l2loopback,
-# and building all three against the stock kernel only to rebuild them against
-# the PTL kernel and tear the first set down again cost ~25s of the install.
-run_logged "$OMARCHY_INSTALL/hardware/intel/ptl-kernel.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/ipu7-camera.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/fred.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/fix-wifi7-eht.sh"
 run_logged "$OMARCHY_INSTALL/hardware/intel/sof-firmware.sh"
 
-# Pulls in v4l2loopback-dkms, so it sits after the Panther Lake kernel swap.
 run_logged "$OMARCHY_INSTALL/hardware/fix-elgato-camlink-4k.sh"
 
-# Rebuilds the boot image, so it has to follow the Panther Lake kernel swap
-# above rather than sit with the other Dell leaf at the top of this file.
+# Rebuilds the boot image, so it follows kernel and camera module setup.
 run_logged "$OMARCHY_INSTALL/hardware/dell-xps13-sidecar-amps.sh"
 
 run_logged "$OMARCHY_INSTALL/hardware/asus/fix-asus-ptl-display-backlight.sh"

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

@@ -4,7 +4,7 @@
 # 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|-omarchy-ptl-novrr-mm)?$' | sed 's/$/-headers/')
+  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
 
   sudo install -Dm644 "$OMARCHY_PATH/default/udev/elgato-camlink-4k.rules" /etc/udev/rules.d/71-elgato-camlink-4k.rules

install/hardware/intel/ptl-kernel.sh

@@ -1,26 +0,0 @@
-# Install Panther Lake kernel for Dell XPS Panther Lake systems
-# The Omarchy PTL kernel includes Panther Lake display and memory fixes.
-
-if omarchy-hw-match "XPS" && omarchy-hw-intel-ptl; then
-  echo "Detected Dell XPS Panther Lake, installing PTL kernel..."
-
-  # linux-ptl required SOF firmware; the new kernel only lists it as optional.
-  omarchy-pkg-add linux-omarchy-ptl-novrr-mm linux-omarchy-ptl-novrr-mm-headers sof-firmware
-  pacman -Rdd --noconfirm linux linux-headers || true
-
-  # The PTL kernel doesn't provide=linux, so anything depending on linux drags the
-  # stock kernel back in and the boot menu grows a second, slower entry.
-  if pacman -Qq linux &>/dev/null; then
-    echo "WARNING: stock linux kernel still installed alongside the Omarchy PTL kernel:"
-    pacman -Qi linux | grep -i "required by"
-  fi
-
-  mkdir -p /etc/limine-entry-tool.d
-  # Named to sort after omarchy-defaults.conf: drop-ins are read in order and
-  # the last BOOT_ORDER wins, so an earlier-sorting name is a silent no-op.
-  rm -f /etc/limine-entry-tool.d/dell-xps-panther-lake.conf
-  cat > /etc/limine-entry-tool.d/zz-dell-xps-panther-lake.conf <<'EOF'
-# Prefer Omarchy kernels while keeping other kernels available for recovery
-BOOT_ORDER="linux-omarchy-*, *, *fallback, Snapshots"
-EOF
-fi

install/hardware/kernel.sh

@@ -0,0 +1,9 @@
+# Install the default kernel before hardware setup pulls in DKMS modules.
+# On a fresh T2 install linux-t2 is not installed yet, so also check the chip.
+if [[ $(uname -m) == "x86_64" ]] && ! omarchy-pkg-present linux-t2; then
+  pci_devices=$(lspci -nn)
+  if ! grep "106b:180[12]" <<< "$pci_devices" >/dev/null; then
+    echo "Installing the Omarchy kernel..."
+    omarchy-pkg-add linux-omarchy linux-omarchy-headers
+  fi
+fi

install/hardware/nvidia.sh

@@ -1,6 +1,6 @@
 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-ptl-novrr-mm)?$' | head -1 || true)
+  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

install/omarchy-other.packages

@@ -23,8 +23,8 @@ limine-snapper-sync
 linux
 linux-firmware
 linux-headers
-linux-omarchy-ptl-novrr-mm
-linux-omarchy-ptl-novrr-mm-headers
+linux-omarchy
+linux-omarchy-headers
 macbook12-spi-driver-dkms
 nvidia-580xx-dkms
 nvidia-dkms