Replace scheduled AUR imports with direct upstream watches

pkgbuilds/macbook12-spi-driver-dkms/.omarchy/package.json

@@ -1,4 +1,17 @@
 {
-  "source": "aur",
-  "upstream_commit": "38f085c6470eee409c22a4753eaf58d58b4759fd"
+  "source": "local",
+  "upstream": {
+    "watch": {
+      "git_branch": "https://github.com/marc-git/macbook12-spi-driver.git",
+      "branch": "touchbar-driver-hid-driver",
+      "version": "0+git.{count}",
+      "variables": {
+        "_commit": "{commit}"
+      }
+    }
+  },
+  "origin": {
+    "aur": "macbook12-spi-driver-dkms",
+    "commit": "38f085c6470eee409c22a4753eaf58d58b4759fd"
+  }
 }

pkgbuilds/macbook12-spi-driver-dkms/PKGBUILD

@@ -3,7 +3,8 @@
 _pkgbase=macbook12-spi-driver
 pkgname=(${_pkgbase}-dkms)
 pkgver=0+git.315
-pkgrel=1
+pkgrel=2
+_commit=807b65b6d9d7c29bd7ff633fbb80596a343e9eb9
 pkgdesc="Driver for the keyboard, touchpad and touchbar found in newer MacBook (Pro) models"
 arch=('i686' 'x86_64')
 url="https://github.com/marc-git/macbook12-spi-driver"
@@ -11,15 +12,11 @@ license=('GPL2')
 depends=('dkms')
 makedepends=('git')
 optdepends=()
-source=(git+https://github.com/marc-git/macbook12-spi-driver.git#branch=touchbar-driver-hid-driver
+source=(git+https://github.com/marc-git/macbook12-spi-driver.git#commit=${_commit}
         dkms.conf)
 sha256sums=('SKIP'
             'e42243352d015a78e5d13260361d3052d0b84c4105bcb89191a319f2249cc47b')
 
-pkgver() {
-    cd $_pkgbase
-    echo "0+git.$(git rev-list HEAD --count)"
-}
 
 package() {
     install -dm755 "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}