omarchy-ane-dkms: ANE on by default on T6021

omarchy-ane removed omarchy-ane-m2-enable and the modprobe gate
packaging/modprobe/ane_t6021.conf, and added 90-omarchy-ane-firmware.hook,
which fetches the T6021 firmware after each install and upgrade
(omarchy-ane receipts/2026-10-01-t6021-default-on).

- package(): install the firmware hook; drop omarchy-ane-m2-enable, the gate
  file and its backup=() entry. On upgrade pacman deletes an unchanged gate
  file; a changed one becomes ane_t6021.conf.pacsave, which modprobe does not
  read (it reads only *.conf).
- post_remove: remove both firmware files that omarchy-ane-firmware-fetch
  writes (T602x and T8112). Drop the ane-t6021 opt-in edit: no overlay reads
  that key now.
- The overlay comment names /usr/share/omarchy-platform/dtb-overlays.

pkgbuilds/omarchy-ane-dkms/PKGBUILD

@@ -19,8 +19,6 @@ optdepends=('linux-aurora-headers: build the modules for linux-aurora'
 # ANE_ABI_MAJOR of ane.ko (ane/src/uapi/drm/ane_accel.h). omarchy-mlx depends on
 # the ABI, not on a package version.
 provides=('omarchy-ane-abi=1')
-# ane_t6021 stays blocked until omarchy-ane-m2-enable edits this file.
-backup=('etc/modprobe.d/ane_t6021.conf')
 install=omarchy-ane-dkms.install
 source=("$_srcname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz")
 sha256sums=('255e1cd93d2ba591d39430f67b49ce48c54079d5cb173764266afb4ef1bbf28d')
@@ -59,12 +57,12 @@ package() {
 
   install -Dm755 -t "$pkgdir/usr/bin" \
     packaging/omarchy-ane-check packaging/omarchy-ane-dt \
-    packaging/omarchy-ane-firmware-fetch packaging/omarchy-ane-m2-enable
+    packaging/omarchy-ane-firmware-fetch
   install -Dm644 packaging/update-m1n1-dtbs "$pkgdir/usr/lib/omarchy-ane/update-m1n1-dtbs"
   install -Dm644 -t "$pkgdir/usr/share/libalpm/hooks" \
-    packaging/90-omarchy-ane-dt.hook packaging/90-omarchy-ane-dt-remove.hook
-  install -Dm644 packaging/modprobe/ane_t6021.conf "$pkgdir/etc/modprobe.d/ane_t6021.conf"
-  # /usr/lib/omarchy-platform/dtb-overlays/PREFIX/omarchy-ane.dtbo
+    packaging/90-omarchy-ane-dt.hook packaging/90-omarchy-ane-dt-remove.hook \
+    packaging/90-omarchy-ane-firmware.hook
+  # /usr/share/omarchy-platform/dtb-overlays/PREFIX/omarchy-NAME.dtbo
   packaging/build-dtbo "$pkgdir"
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"

pkgbuilds/omarchy-ane-dkms/omarchy-ane-dkms.install

@@ -1,12 +1,7 @@
-# omarchy-ane-m2-enable writes these two files. pacman does not own them, so
-# remove them with the package, as omarchy-ane-m2-enable --disable does.
+# omarchy-ane-firmware-fetch writes the ANE firmware (90-omarchy-ane-firmware.hook
+# on T6021, by hand on T6020, T6022 and T8112). pacman does not own it.
 post_remove() {
-  rm -f /usr/lib/firmware/apple/ane/t602x_ane0_fw_selene_rc4x.macho
+  rm -f /usr/lib/firmware/apple/ane/t602x_ane0_fw_selene_rc4x.macho \
+    /usr/lib/firmware/apple/ane/h14_ane_fw_bia_j4xx.macho
   rmdir /usr/lib/firmware/apple/ane 2>/dev/null || :
-
-  local opt_in=/etc/omarchy-platform/dtb-overlays.opt-in
-  if [[ -f $opt_in ]]; then
-    sed -i '/^ane-t6021$/d' "$opt_in"
-    [[ -s $opt_in ]] || rm -f "$opt_in"
-  fi
 }