From 7e532cbd9a4a185304b1183abffd3f21f5393971 Mon Sep 17 00:00:00 2001
From: Tom Ballard <tom.ballard08@googlemail.com>
Date: Thu, 3 Sep 2026 17:18:23 +0000
Subject: [PATCH 1/3] Add plugin workbench package

---
 .../.omarchy/package.json                     |  4 ++
 pkgbuilds/omarchy-plugin-workbench/PKGBUILD   | 38 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgbuilds/omarchy-plugin-workbench/.omarchy/package.json
 create mode 100644 pkgbuilds/omarchy-plugin-workbench/PKGBUILD

diff --git a/pkgbuilds/omarchy-plugin-workbench/.omarchy/package.json b/pkgbuilds/omarchy-plugin-workbench/.omarchy/package.json
new file mode 100644
index 000000000..db153c3eb
--- /dev/null
+++ b/pkgbuilds/omarchy-plugin-workbench/.omarchy/package.json
@@ -0,0 +1,4 @@
+{
+  "source": "local",
+  "release_ring": "fast"
+}
diff --git a/pkgbuilds/omarchy-plugin-workbench/PKGBUILD b/pkgbuilds/omarchy-plugin-workbench/PKGBUILD
new file mode 100644
index 000000000..41af9323d
--- /dev/null
+++ b/pkgbuilds/omarchy-plugin-workbench/PKGBUILD
@@ -0,0 +1,38 @@
+pkgname=omarchy-plugin-workbench
+pkgver=0.2.0
+pkgrel=1
+pkgdesc='Native Omarchy plugin development and management helper'
+arch=('x86_64' 'aarch64')
+url='https://github.com/tcballard/omarchy-plugin-workbench'
+license=('MIT')
+depends=('gcc-libs' 'glibc' 'git' 'curl')
+makedepends=('cargo')
+
+_commit='4bdab3c7e477f475766f138f7085c42f03ba5586'
+source=("$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz")
+sha256sums=('b6123d69e66391f9974151cd1b0c4ae0957560e37b968c6572fa8b224c739bd1')
+
+prepare() {
+  cd "$pkgname-$_commit"
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
+}
+
+build() {
+  cd "$pkgname-$_commit"
+  export CARGO_TARGET_DIR=target
+  cargo build --frozen --release
+}
+
+check() {
+  cd "$pkgname-$_commit"
+  export CARGO_TARGET_DIR=target
+  cargo test --frozen --all-targets --all-features
+}
+
+package() {
+  cd "$pkgname-$_commit"
+  install -Dm755 target/release/omarchy-plugin-workbench \
+    "$pkgdir/usr/bin/omarchy-plugin-workbench"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+}

From 3d7d24b4b65c5c26daf22abc12bc065295e60975 Mon Sep 17 00:00:00 2001
From: Tom Ballard <tom.ballard08@googlemail.com>
Date: Thu, 3 Sep 2026 19:12:26 +0000
Subject: [PATCH 2/3] Package Omarchy Discovery

---
 .../.omarchy/package.json                     |  0
 .../PKGBUILD                                  | 25 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)
 rename pkgbuilds/{omarchy-plugin-workbench => omarchy-discovery}/.omarchy/package.json (100%)
 rename pkgbuilds/{omarchy-plugin-workbench => omarchy-discovery}/PKGBUILD (56%)

diff --git a/pkgbuilds/omarchy-plugin-workbench/.omarchy/package.json b/pkgbuilds/omarchy-discovery/.omarchy/package.json
similarity index 100%
rename from pkgbuilds/omarchy-plugin-workbench/.omarchy/package.json
rename to pkgbuilds/omarchy-discovery/.omarchy/package.json
diff --git a/pkgbuilds/omarchy-plugin-workbench/PKGBUILD b/pkgbuilds/omarchy-discovery/PKGBUILD
similarity index 56%
rename from pkgbuilds/omarchy-plugin-workbench/PKGBUILD
rename to pkgbuilds/omarchy-discovery/PKGBUILD
index 41af9323d..9fa8c6e69 100644
--- a/pkgbuilds/omarchy-plugin-workbench/PKGBUILD
+++ b/pkgbuilds/omarchy-discovery/PKGBUILD
@@ -1,38 +1,41 @@
-pkgname=omarchy-plugin-workbench
-pkgver=0.2.0
+pkgname=omarchy-discovery
+pkgver=0.3.0
 pkgrel=1
-pkgdesc='Native Omarchy plugin development and management helper'
+pkgdesc='Native Omarchy discovery and ecosystem management helper'
 arch=('x86_64' 'aarch64')
 url='https://github.com/tcballard/omarchy-plugin-workbench'
 license=('MIT')
 depends=('gcc-libs' 'glibc' 'git' 'curl')
 makedepends=('cargo')
+provides=('omarchy-plugin-workbench')
+conflicts=('omarchy-plugin-workbench')
 
-_commit='4bdab3c7e477f475766f138f7085c42f03ba5586'
+_commit='5d7af0b7ded2faae3a036f43936c7e338a16d9e9'
+_srcdir="omarchy-plugin-workbench-$_commit"
 source=("$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz")
-sha256sums=('b6123d69e66391f9974151cd1b0c4ae0957560e37b968c6572fa8b224c739bd1')
+sha256sums=('dd5d947dacc6a0f74f8df504fc84ab43c34c299d785df3f7f20138dcad054594')
 
 prepare() {
-  cd "$pkgname-$_commit"
+  cd "$_srcdir"
   cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
 build() {
-  cd "$pkgname-$_commit"
+  cd "$_srcdir"
   export CARGO_TARGET_DIR=target
   cargo build --frozen --release
 }
 
 check() {
-  cd "$pkgname-$_commit"
+  cd "$_srcdir"
   export CARGO_TARGET_DIR=target
   cargo test --frozen --all-targets --all-features
 }
 
 package() {
-  cd "$pkgname-$_commit"
-  install -Dm755 target/release/omarchy-plugin-workbench \
-    "$pkgdir/usr/bin/omarchy-plugin-workbench"
+  cd "$_srcdir"
+  install -Dm755 target/release/omarchy-discovery \
+    "$pkgdir/usr/bin/omarchy-discovery"
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
 }

From 838aabf3cec4eb02f0cd069f5e7283a8ca27bd5f Mon Sep 17 00:00:00 2001
From: Tom Ballard <tom.ballard08@googlemail.com>
Date: Thu, 3 Sep 2026 19:26:37 +0000
Subject: [PATCH 3/3] Pin merged Discovery source

---
 pkgbuilds/omarchy-discovery/PKGBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgbuilds/omarchy-discovery/PKGBUILD b/pkgbuilds/omarchy-discovery/PKGBUILD
index 9fa8c6e69..335dc9698 100644
--- a/pkgbuilds/omarchy-discovery/PKGBUILD
+++ b/pkgbuilds/omarchy-discovery/PKGBUILD
@@ -10,10 +10,10 @@ makedepends=('cargo')
 provides=('omarchy-plugin-workbench')
 conflicts=('omarchy-plugin-workbench')
 
-_commit='5d7af0b7ded2faae3a036f43936c7e338a16d9e9'
+_commit='0d3c38085a0da6021842f29fbd2b6c2bd451d49a'
 _srcdir="omarchy-plugin-workbench-$_commit"
 source=("$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz")
-sha256sums=('dd5d947dacc6a0f74f8df504fc84ab43c34c299d785df3f7f20138dcad054594')
+sha256sums=('1d91e1c3856a54893c9df6a81bd5016fb0cb0f76781e99794a56a9a352d0ed86')
 
 prepare() {
   cd "$_srcdir"