Switch to tag-pinned bread-ecosystem deps; bump version to v0.3.0

Migrate to bread-utils: Hyprland IPC, single-instance lock, popup scaffold
Replaces three hand-rolled pieces of code with the new shared bread-utils crate (path dependency for now, see the TODO in breadbox/Cargo.toml): - get_active_workspace's raw socket1 client -> bread_utils::hypr - toggle_or_continue's TOCTOU-prone PID-file dance -> bread_utils::singleton (flock-based, no read-then-write race) - the layer-shell window setup, Up/Down visible-row navigation, and click-outside-close gesture -> bread_utils::gtk_popup Builds and tests clean across the whole breadbox workspace.
2026-07-19 03:39:39 +08:00 · 2026-07-17 09:20:06 +08:00 · 2026-07-17 03:18:38 +08:00 · 2026-07-16 18:04:39 +08:00 · 2026-07-16 17:51:57 +08:00 · 2026-07-05 09:15:42 +08:00
11 changed files with 241 additions and 294 deletions
--- a/.forgejo/workflows/mirror.yml
+++ b/.forgejo/workflows/mirror.yml
@ -14,8 +14,6 @@ jobs:
          set -euo pipefail
          git clone --mirror "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" repo.git
          cd repo.git
-          # Mirror only branches and tags (not refs/pull/*, which GitHub rejects);
-          # --prune deletes GitHub refs that no longer exist on Forgejo.
          git push --prune \
            "https://x-access-token:${{ secrets.MIRROR_TOKEN }}@github.com/Breadway/breadbox.git" \
            '+refs/heads/*:refs/heads/*' '+refs/tags/*:refs/tags/*'
--- a/.forgejo/workflows/release.yml
+++ b/.forgejo/workflows/release.yml
@ -0,0 +1,59 @@
+name: release
+
+on:
+  push:
+    tags: ["v*"]
+
+jobs:
+  build:
+    runs-on: [self-hosted, hestia]
+    steps:
+      - name: checkout
+        run: |
+          set -euo pipefail
+          rm -rf src && mkdir src
+          git clone --branch "${GITHUB_REF_NAME}" --depth 1 \
+            "https://git.breadway.dev/${GITHUB_REPOSITORY}.git" src
+
+      - name: build
+        run: cd src && cargo build --release --locked
+
+      - name: prepare artifacts
+        run: |
+          set -euo pipefail
+          VERSION="${GITHUB_REF_NAME#v}"
+          PKG_DIR="/srv/breadway-dl/breadbox/${VERSION}"
+          mkdir -p "${PKG_DIR}"
+          for bin in breadbox breadbox-sync; do
+            cp "src/target/release/${bin}" "${PKG_DIR}/${bin}-x86_64"
+            strip "${PKG_DIR}/${bin}-x86_64"
+            sha256sum "${PKG_DIR}/${bin}-x86_64" | awk '{print $1}' \
+              > "${PKG_DIR}/${bin}-x86_64.sha256"
+          done
+          cp src/packaging/breadbox-sync.service "${PKG_DIR}/"
+          cp src/config.example.toml "${PKG_DIR}/"
+          cp src/bakery.toml "${PKG_DIR}/bakery.toml"
+          ln -sfn "${VERSION}" "/srv/breadway-dl/breadbox/latest"
+
+      - name: regenerate index.json
+        run: |
+          set -euo pipefail
+          rm -rf /tmp/bread-ecosystem-ci
+          git clone https://git.breadway.dev/Breadway/bread-ecosystem.git /tmp/bread-ecosystem-ci
+          bash /tmp/bread-ecosystem-ci/scripts/gen-index.sh
+
+      - name: upload to GitHub Release
+        env:
+          GH_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}
+        run: |
+          set -euo pipefail
+          VERSION="${GITHUB_REF_NAME#v}"
+          PKG_DIR="/srv/breadway-dl/breadbox/${VERSION}"
+          gh release create "${GITHUB_REF_NAME}" --repo Breadway/breadbox \
+            --title "breadbox v${VERSION}" --generate-notes 2>/dev/null || true
+          gh release upload "${GITHUB_REF_NAME}" --repo Breadway/breadbox \
+            "${PKG_DIR}/breadbox-x86_64" \
+            "${PKG_DIR}/breadbox-sync-x86_64" \
+            "${PKG_DIR}/breadbox-x86_64.sha256" \
+            "${PKG_DIR}/breadbox-sync-x86_64.sha256" \
+            --clobber
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,67 +0,0 @@
-name: release
-
-on:
-  push:
-    tags: ["v*"]
-
-permissions:
-  contents: write
-
-env:
-  DL_DIR: /srv/breadway-dl
-  ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem
-
-jobs:
-  build:
-    runs-on: [self-hosted, hestia]
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: install build deps
-        run: sudo apt-get install -y libgtk-4-dev librsvg2-dev libdbus-1-dev pkg-config 2>/dev/null || true
-
-      - name: build
-        run: cargo build --release --locked
-
-      - name: prepare artifacts
-        run: |
-          VERSION="${GITHUB_REF_NAME#v}"
-          PKG_DIR="${DL_DIR}/breadbox/${VERSION}"
-          mkdir -p "${PKG_DIR}"
-          for bin in breadbox breadbox-sync; do
-            cp "target/release/${bin}" "${PKG_DIR}/${bin}-x86_64"
-            strip "${PKG_DIR}/${bin}-x86_64"
-            sha256sum "${PKG_DIR}/${bin}-x86_64" | awk '{print $1}' \
-              > "${PKG_DIR}/${bin}-x86_64.sha256"
-          done
-          cp packaging/breadbox-sync.service "${PKG_DIR}/"
-          cp config.example.toml "${PKG_DIR}/"
-          cp bakery.toml "${PKG_DIR}/bakery.toml"
-          ln -sfn "${VERSION}" "${DL_DIR}/breadbox/latest"
-
-      - name: ensure bread-ecosystem
-        run: |
-          if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then
-            git -C "${ECOSYSTEM_DIR}" pull --ff-only
-          else
-            mkdir -p "$(dirname "${ECOSYSTEM_DIR}")"
-            git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}"
-          fi
-
-      - name: regenerate index.json
-        run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh"
-
-      - name: upload to GitHub Release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          VERSION="${GITHUB_REF_NAME#v}"
-          PKG_DIR="${DL_DIR}/breadbox/${VERSION}"
-          gh release create "${GITHUB_REF_NAME}" \
-            --title "breadbox v${VERSION}" --generate-notes 2>/dev/null || true
-          gh release upload "${GITHUB_REF_NAME}" \
-            "${PKG_DIR}/breadbox-x86_64" \
-            "${PKG_DIR}/breadbox-sync-x86_64" \
-            "${PKG_DIR}/breadbox-x86_64.sha256" \
-            "${PKG_DIR}/breadbox-sync-x86_64.sha256" \
-            --clobber
--- a/Cargo.lock
+++ b/Cargo.lock
@ -22,14 +22,14 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"

 [[package]]
 name = "bread-theme"
 version = "0.2.3"
-source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.8#77417d552130281ff787e07d52541eb25e9d533b"
+source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.10#17d1bb85801b9a8c195b64c02d288cd662c9c780"
 dependencies = [
 "dirs",
 "gtk4",
@ -37,11 +37,24 @@ dependencies = [
 "serde_json",
 ]

+[[package]]
+name = "bread-utils"
+version = "0.3.0"
+source = "git+https://git.breadway.dev/Breadway/bread-ecosystem?tag=v0.3.0#8e82d2d833e992ce939a5b836f910ee109f2e939"
+dependencies = [
+ "dirs",
+ "gtk4",
+ "gtk4-layer-shell",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "breadbox"
-version = "0.2.4"
+version = "0.2.7"
 dependencies = [
 "bread-theme",
+ "bread-utils",
 "breadbox-shared",
 "gtk4",
 "gtk4-layer-shell",
@ -50,7 +63,7 @@ dependencies = [

 [[package]]
 name = "breadbox-shared"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
 "serde",
 "serde_json",
@ -59,7 +72,7 @@ dependencies = [

 [[package]]
 name = "breadbox-sync"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
 "breadbox-shared",
 "serde_json",
@ -91,9 +104,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.63"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
+checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@ -199,24 +212,24 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae"
 dependencies = [
 "futures-core",
 ]

 [[package]]
 name = "futures-core"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"

 [[package]]
 name = "futures-executor"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458"
 dependencies = [
 "futures-core",
 "futures-task",
@ -225,15 +238,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a"

 [[package]]
 name = "futures-macro"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b"
 dependencies = [
 "proc-macro2",
 "quote",
@ -242,15 +255,15 @@ dependencies = [

 [[package]]
 name = "futures-task"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"

 [[package]]
 name = "futures-util"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
 dependencies = [
 "futures-core",
 "futures-macro",
@ -286,9 +299,9 @@ dependencies = [

 [[package]]
 name = "gdk4"
-version = "0.11.2"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd42fdbbf48612c6e8f47c65fb92d2e8f39c25aecd6af047e83897c1a22d2a4e"
+checksum = "d81e2a6c6ecba2aab60633a98df1868b03fa0bfdce8105edc27c1bccf71f0e39"
 dependencies = [
 "cairo-rs",
 "gdk-pixbuf",
@ -302,9 +315,9 @@ dependencies = [

 [[package]]
 name = "gdk4-sys"
-version = "0.11.2"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d974ac4f15e67472c3a9728daf612590b4a5762a4b33f0edd298df0b80d043c"
+checksum = "3d8f608d8d7d229975c4d0d026f5d3071598c4ddab3c5262b0a31840fec78d13"
 dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
@ -330,9 +343,9 @@ dependencies = [

 [[package]]
 name = "gio"
-version = "0.22.6"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3848bcba3a35cc0a71df8ba8ecfd799d6bfb862342a53a4a915fb62213aa4e6"
+checksum = "8b3e1f669909c326b9413bde5a742097b8c90a7d78f45326db13668984769ded"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -347,9 +360,9 @@ dependencies = [

 [[package]]
 name = "gio-sys"
-version = "0.22.0"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64729ba2772c080448f9f966dba8f4456beeb100d8c28a865ef8a0f2ef4987e1"
+checksum = "353fdc7da7cd16da916104b1e0e4e7de380ec9c8aaa20d4d742d66310ab4b0d5"
 dependencies = [
 "glib-sys",
 "gobject-sys",
@ -380,9 +393,9 @@ dependencies = [

 [[package]]
 name = "glib"
-version = "0.22.7"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c207e04e51605dcf7b2924c41591b3a10e1438eaac5bcf448fb91f325381104a"
+checksum = "ddbcf514bd1881fc1b960e4e52b4e82873f4da3bceddbd58d42827b508888100"
 dependencies = [
 "bitflags",
 "futures-channel",
@ -413,9 +426,9 @@ dependencies = [

 [[package]]
 name = "glib-sys"
-version = "0.22.6"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f7fbac234ed5bc2a28359b7bde8e1b9cdf1441cc2d7f068e4824672d7db9445"
+checksum = "030967459f9f676851872c6304adea7825c6d462ec9b72554c733cf0c5952233"
 dependencies = [
 "libc",
 "system-deps",
@ -434,32 +447,30 @@ dependencies = [

 [[package]]
 name = "graphene-rs"
-version = "0.22.0"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7d1b7881f96869f49808b6adfe906a93a57a34204952253444d68c3208d71f1"
+checksum = "eb856b9c558971c3f13ab692358926da710b046932a4e087aedcc35b040d7dff"
 dependencies = [
 "glib",
 "graphene-sys",
- "libc",
 ]

 [[package]]
 name = "graphene-sys"
-version = "0.22.0"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "517f062f3fd6b7fd3e57a3f038a74b3c23ca32f51199ff028aa704609943f79c"
+checksum = "5c7ffdfde88f3570d3705e0d8a2433e036d387a1f2930bbf47eafcb5f569fd04"
 dependencies = [
 "glib-sys",
 "libc",
- "pkg-config",
 "system-deps",
 ]

 [[package]]
 name = "gsk4"
-version = "0.11.1"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53c912dfcbd28acace5fc99c40bb9f25e1dcb73efb1f2608327f66a99acdcb62"
+checksum = "b867be1c5f14dcb8f552c0eff6e9a9b1da5f8b43943e8efc3a63c889d84952ff"
 dependencies = [
 "cairo-rs",
 "gdk4",
@ -472,9 +483,9 @@ dependencies = [

 [[package]]
 name = "gsk4-sys"
-version = "0.11.1"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d54bbc7a9d8b6ffe4f0c95eede15ccfb365c8bf521275abe6bcfb57b18fb8a"
+checksum = "5b7c7eb2e681ee896646cfb8872b431f24d09f53ba9283289d9b10caa6707088"
 dependencies = [
 "cairo-sys-rs",
 "gdk4-sys",
@ -488,9 +499,9 @@ dependencies = [

 [[package]]
 name = "gtk4"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7181b837f04cbe93f79441475f7a00560a92cba7a72e38cc1a68b6f8b78eaae2"
+checksum = "98a0a0466484f64b07b5b8184d43fa46be78eb0b8e04ae4e179af31d770b76d9"
 dependencies = [
 "cairo-rs",
 "field-offset",
@ -537,9 +548,9 @@ dependencies = [

 [[package]]
 name = "gtk4-macros"
-version = "0.11.0"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3581b242ba62fdff122ebb626ea641582ec326031622bd19d60f85029c804a87"
+checksum = "5ac7179400a36a04de039c24206bb841c5596992b907b43b23ee8d5bdc40d00e"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
@ -549,9 +560,9 @@ dependencies = [

 [[package]]
 name = "gtk4-sys"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20ba8e695e2640455561274e65e45f0a151619e450746007667f4b23ceae4e1b"
+checksum = "82b8f954786af0b1984425c4446b77f5ff6594346181316be3f850caab1c6f01"
 dependencies = [
 "cairo-sys-rs",
 "gdk-pixbuf-sys",
@ -711,9 +722,9 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"

 [[package]]
 name = "libredox"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
 dependencies = [
 "libc",
 ]
@ -726,15 +737,15 @@ checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"

 [[package]]
 name = "log"
-version = "0.4.32"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"

 [[package]]
 name = "memchr"
-version = "2.8.1"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"

 [[package]]
 name = "memoffset"
@ -769,13 +780,12 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
 name = "pango"
-version = "0.22.6"
+version = "0.22.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "251bdc6e6487b811be0e406a21e301e07e45c0aa8fa39e00c0c8e12a91752438"
+checksum = "5d800d8d0de2ad5d0fb046f5344dbaba14a003cf3dd27cc21d85893d35ea316c"
 dependencies = [
 "gio",
 "glib",
- "libc",
 "pango-sys",
 ]

@ -824,7 +834,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.25.12+spec-1.1.0",
+ "toml_edit 0.25.13+spec-1.1.0",
 ]

 [[package]]
@ -838,9 +848,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
 "proc-macro2",
 ]
@ -881,9 +891,9 @@ dependencies = [

 [[package]]
 name = "rustls"
-version = "0.23.40"
+version = "0.23.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b"
+checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138"
 dependencies = [
 "log",
 "once_cell",
@ -896,9 +906,9 @@ dependencies = [

 [[package]]
 name = "rustls-pki-types"
-version = "1.14.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9"
+checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
 dependencies = [
 "zeroize",
 ]
@ -989,9 +999,9 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"

 [[package]]
 name = "simd-adler32"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"

 [[package]]
 name = "slab"
@ -1001,9 +1011,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"

 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"

 [[package]]
 name = "stable_deref_trait"
@ -1019,9 +1029,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"

 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1048,7 +1058,7 @@ dependencies = [
 "cfg-expr",
 "heck",
 "pkg-config",
- "toml 1.1.2+spec-1.1.0",
+ "toml 1.1.3+spec-1.1.0",
 "version-compare",
 ]

@ -1102,9 +1112,9 @@ dependencies = [

 [[package]]
 name = "toml"
-version = "1.1.2+spec-1.1.0"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
+checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c"
 dependencies = [
 "indexmap",
 "serde_core",
@ -1112,7 +1122,7 @@ dependencies = [
 "toml_datetime 1.1.1+spec-1.1.0",
 "toml_parser",
 "toml_writer",
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]

 [[package]]
@ -1149,14 +1159,14 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.25.12+spec-1.1.0"
+version = "0.25.13+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
+checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b"
 dependencies = [
 "indexmap",
 "toml_datetime 1.1.1+spec-1.1.0",
 "toml_parser",
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]

 [[package]]
@ -1165,7 +1175,7 @@ version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]

 [[package]]
@ -1176,9 +1186,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"

 [[package]]
 name = "toml_writer"
-version = "1.1.1+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
+checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"

 [[package]]
 name = "unicode-ident"
@ -1244,14 +1254,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.7",
+ "webpki-roots 1.0.9",
 ]

 [[package]]
 name = "webpki-roots"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d"
+checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a"
 dependencies = [
 "rustls-pki-types",
 ]
@ -1421,9 +1431,9 @@ dependencies = [

 [[package]]
 name = "winnow"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 dependencies = [
 "memchr",
 ]
@ -1486,9 +1496,9 @@ dependencies = [

 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"

 [[package]]
 name = "zerotrie"
@ -1525,6 +1535,6 @@ dependencies = [

 [[package]]
 name = "zmij"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
--- a/README.md
+++ b/README.md
@ -12,7 +12,8 @@ breadbox          GTK4 layer-shell launcher

 - Layer-shell window, centered 600 px wide, keyboard-exclusive
 - Reads the active Hyprland workspace and sorts apps by context priority
- Fuzzy filtering as you type; Enter launches, Escape closes
+- Launch history: non-priority apps sort by most-launched first, then alphabetically
+- Fuzzy filtering as you type; Enter or click to launch, Escape or click outside to close
 - App icons loaded from the resolved icon cache (see `breadbox-sync`)
 - pywal palette auto-detected from `~/.cache/wal/colors.json`, falls back to Catppuccin Mocha
 - User CSS override at `~/.config/breadbox/style.css`
@ -88,10 +89,9 @@ breadbox-sync
 ```

 Icon resolution order:
-1. System icon theme (`~/.local/share/icons`, `/usr/share/icons`, `/usr/share/pixmaps`) — 64 px > 48 px PNG, then SVG
-2. Flathub media server — for reverse-DNS app IDs (e.g. `org.gnome.Gedit`)
-3. icon.horse — downloaded and cached
-4. `application-x-executable` fallback from system theme
+1. System icon theme (`~/.local/share/icons`, `/usr/share/icons`, `/usr/share/pixmaps`) — 64 px > 48 px > 128 px > 32 px > 256 px PNG, then SVG
+2. Flathub appstream CDN — for reverse-DNS app IDs (e.g. `org.gnome.Gedit`)
+3. `application-x-executable` fallback from system theme

 ### Systemd service (run on login)

--- a/breadbox-shared/Cargo.toml
+++ b/breadbox-shared/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "breadbox-shared"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 license = "MIT"

--- a/breadbox-sync/Cargo.toml
+++ b/breadbox-sync/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "breadbox-sync"
-version = "0.2.4"
+version = "0.2.6"
 edition = "2021"
 license = "MIT"

--- a/breadbox/Cargo.toml
+++ b/breadbox/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "breadbox"
-version = "0.2.4"
+version = "0.2.7"
 edition = "2021"
 license = "MIT"

@ -9,7 +9,8 @@ name = "breadbox"
 path = "src/main.rs"

 [dependencies]
-bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.8", features = ["gtk"] }
+bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.10", features = ["gtk"] }
+bread-utils = { git = "https://git.breadway.dev/Breadway/bread-ecosystem", tag = "v0.3.0", features = ["gtk"] }
 breadbox-shared = { path = "../breadbox-shared" }
 gtk4 = { version = "0.11", features = ["v4_12"] }
 gtk4-layer-shell = "0.8"
--- a/breadbox/src/main.rs
+++ b/breadbox/src/main.rs
@ -4,8 +4,6 @@ use std::{
    collections::HashMap,
    env,
    fs,
-    io::{Read, Write},
-    os::unix::net::UnixStream,
    path::{Path, PathBuf},
    process::{Command, Stdio},
    rc::Rc,
@ -18,28 +16,9 @@ use gtk4::{
    glib,
    pango::EllipsizeMode,
    prelude::*,
-    Application, ApplicationWindow, Box as GBox, CssProvider, EventControllerKey, Label,
+    Application, Box as GBox, CssProvider, EventControllerKey, Label,
    ListBox, Orientation, PolicyType, ScrolledWindow, SearchEntry, SelectionMode,
 };
-use gtk4_layer_shell::{Edge, KeyboardMode, Layer, LayerShell};
-
-// ---- Hyprland IPC -----------------------------------------------------------
-
-fn get_active_workspace() -> Option<String> {
-    let sig = env::var("HYPRLAND_INSTANCE_SIGNATURE").ok()?;
-    let rt = env::var("XDG_RUNTIME_DIR").ok()?;
-    let socket_path = format!("{}/hypr/{}/.socket.sock", rt, sig);
-
-    let mut stream = UnixStream::connect(&socket_path).ok()?;
-    stream.write_all(b"j/activeworkspace").ok()?;
-    stream.shutdown(std::net::Shutdown::Write).ok()?;
-
-    let mut response = String::new();
-    stream.read_to_string(&mut response).ok()?;
-
-    let v: serde_json::Value = serde_json::from_str(&response).ok()?;
-    v["name"].as_str().map(|s| s.to_string())
-}

 // ---- Manifest ---------------------------------------------------------------

@ -252,38 +231,40 @@ fn fuzzy_score(query: &str, entry: &DesktopEntry) -> u32 {
    4 // subsequence match
 }

-// ---- PID file toggle --------------------------------------------------------
-
-fn pid_file() -> PathBuf {
-    env::var("XDG_RUNTIME_DIR")
-        .map(PathBuf::from)
-        .unwrap_or_else(|_| PathBuf::from("/tmp"))
-        .join("breadbox.pid")
-}
-
-fn is_breadbox_pid(pid: u32) -> bool {
-    fs::read_to_string(format!("/proc/{}/comm", pid))
-        .map(|s| s.trim() == "breadbox")
-        .unwrap_or(false)
-}
-
-// Returns false if an existing instance was killed (caller should exit).
-fn toggle_or_continue() -> bool {
-    let pf = pid_file();
-    if let Ok(content) = fs::read_to_string(&pf) {
-        if let Ok(pid) = content.trim().parse::<u32>() {
-            if is_breadbox_pid(pid) {
-                let _ = Command::new("kill").arg(pid.to_string()).status();
-                return false;
+/// Same tiers as `fuzzy_score`, but `None` when nothing matches at all
+/// (rather than falling through to a bare-subsequence score), and folds in
+/// `exec` as a tier-4 (weakest) match too — used for filtering, not sorting.
+/// Tier 4 is loose enough that e.g. querying "zen" matches "Avahi Zeroconf
+/// Browser" (z…e…n as a subsequence) alongside the real "Zen Browser" hit;
+/// the filter hides tier-4-only rows whenever a tier ≤2 (name-based) match
+/// exists elsewhere in the list, so that kind of noise only shows up when
+/// it's the best any entry can do.
+fn match_tier(query: &str, entry: &DesktopEntry) -> Option<u32> {
+    if query.is_empty() {
+        return Some(0);
    }
+    let q = query.to_lowercase();
+    let name = entry.name.to_lowercase();
+    let wm = entry.wm_class.as_deref().unwrap_or("").to_lowercase();
+    if name == q || wm == q {
+        return Some(0);
    }
+    if name.starts_with(&q) {
+        return Some(1);
    }
-    let _ = fs::write(&pf, std::process::id().to_string());
-    true
-}
-
-fn cleanup_pid() {
-    let _ = fs::remove_file(pid_file());
+    if name.contains(&q) {
+        return Some(2);
+    }
+    if wm.starts_with(&q) || wm.contains(&q) {
+        return Some(3);
+    }
+    if fuzzy_matches(query, &entry.name)
+        || entry.wm_class.as_deref().is_some_and(|w| fuzzy_matches(query, w))
+        || fuzzy_matches(query, &entry.exec)
+    {
+        return Some(4);
+    }
+    None
 }

 // ---- UI ---------------------------------------------------------------------
@ -318,20 +299,11 @@ fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
        }

        // Full-screen transparent window; clicks outside the launcher panel close it.
-        let window = ApplicationWindow::builder().application(app).build();
-        window.init_layer_shell();
-        window.set_namespace(Some("breadbox"));
-        window.set_layer(Layer::Overlay);
-        window.set_keyboard_mode(KeyboardMode::Exclusive);
-        for edge in [Edge::Top, Edge::Bottom, Edge::Left, Edge::Right] {
-            window.set_anchor(edge, true);
-        }
-        window.set_exclusive_zone(0);
+        let window = bread_utils::gtk_popup::new_overlay_window(app, "breadbox");

        let close_all: Rc<dyn Fn()> = Rc::new({
            let w = window.clone();
            move || {
-                cleanup_pid();
                w.close();
            }
        });
@ -344,7 +316,7 @@ fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
        vbox.set_size_request(600, -1);

        let search = SearchEntry::new();
-        search.set_placeholder_text(Some("breadbox"));
+        search.set_placeholder_text(Some("Search apps…"));
        vbox.append(&search);

        let scroll = ScrolledWindow::new();
@ -425,20 +397,26 @@ fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
            let text = entry.text();
            let query = text.as_str();
            *filter_query.borrow_mut() = query.to_string();
+
+            // Two passes: first collect each row's match tier, then decide
+            // visibility — a tier-4 (bare subsequence) row only gets hidden
+            // once we know whether some *other* row has a real tier ≤2 hit.
+            let mut rows = Vec::new();
            let mut i = 0i32;
            while let Some(row) = list_f.row_at_index(i) {
-                let vis = get_row_entry(&row)
-                    .map(|e| {
-                        fuzzy_matches(query, &e.name)
-                            || e.wm_class
-                                .as_deref()
-                                .is_some_and(|w| fuzzy_matches(query, w))
-                            || fuzzy_matches(query, &e.exec)
-                    })
-                    .unwrap_or(false);
-                row.set_visible(vis);
+                let tier = get_row_entry(&row).and_then(|e| match_tier(query, &e));
+                rows.push((row, tier));
                i += 1;
            }
+            let has_direct_hit = rows.iter().any(|(_, t)| matches!(t, Some(0..=2)));
+            for (row, tier) in &rows {
+                let vis = match tier {
+                    None => false,
+                    Some(4) if has_direct_hit => false,
+                    Some(_) => true,
+                };
+                row.set_visible(vis);
+            }
            list_f.invalidate_sort();
            let first_vis = (0i32..).find_map(|j| {
                list_f.row_at_index(j).filter(|r| r.is_visible())
@ -471,36 +449,11 @@ fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
                    glib::Propagation::Stop
                }
                Key::Down => {
-                    let cur = list_k.selected_row().map(|r| r.index()).unwrap_or(-1);
-                    let mut i = cur + 1;
-                    loop {
-                        match list_k.row_at_index(i) {
-                            Some(r) if r.is_visible() => {
-                                list_k.select_row(Some(&r));
-                                break;
-                            }
-                            Some(_) => i += 1,
-                            None => break,
-                        }
-                    }
+                    bread_utils::gtk_popup::select_next_visible(&list_k);
                    glib::Propagation::Stop
                }
                Key::Up => {
-                    let cur = list_k.selected_row().map(|r| r.index()).unwrap_or(0);
-                    let mut i = cur - 1;
-                    loop {
-                        if i < 0 {
-                            break;
-                        }
-                        match list_k.row_at_index(i) {
-                            Some(r) if r.is_visible() => {
-                                list_k.select_row(Some(&r));
-                                break;
-                            }
-                            Some(_) => i -= 1,
-                            None => break,
-                        }
-                    }
+                    bread_utils::gtk_popup::select_prev_visible(&list_k);
                    glib::Propagation::Stop
                }
                _ => glib::Propagation::Proceed,
@ -522,23 +475,8 @@ fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {

        // Click outside launcher panel → close
        let close_outside = Rc::clone(&close_all);
-        let vbox_ref = vbox.clone();
-        let win_ref = window.clone();
-        let outside_click = gtk4::GestureClick::new();
-        outside_click.connect_pressed(move |_, _, x, y| {
-            if let Some(b) = vbox_ref.compute_bounds(&win_ref) {
-                if x < b.x() as f64
-                    || x > (b.x() + b.width()) as f64
-                    || y < b.y() as f64
-                    || y > (b.y() + b.height()) as f64
-                {
-                    close_outside();
-                }
-            }
-        });
-        window.add_controller(outside_click);
+        bread_utils::gtk_popup::close_on_outside_click(&window, &vbox, move || close_outside());

-        window.connect_destroy(|_| cleanup_pid());
        window.present();
        search.grab_focus();
    });
@ -549,12 +487,20 @@ fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
 // ---- Main -------------------------------------------------------------------

 fn main() {
-    if !toggle_or_continue() {
-        return;
+    // Kept alive for the rest of `main` — dropping it releases the
+    // single-instance lock and removes the pid file, which happens
+    // naturally once `run_ui` returns (after the window closes).
+    let _singleton_guard = match bread_utils::singleton::toggle_or_kill("breadbox") {
+        Ok(bread_utils::singleton::Toggle::Started(guard)) => Some(guard),
+        Ok(bread_utils::singleton::Toggle::KilledExisting) => return,
+        Err(e) => {
+            eprintln!("breadbox: single-instance lock unavailable ({e}); continuing without it");
+            None
        }
+    };

    let config = Config::load();
-    let workspace = get_active_workspace().unwrap_or_default();
+    let workspace = bread_utils::hypr::active_workspace_name().unwrap_or_default();
    let priority = config
        .context_for(&workspace)
        .map(|c| c.priority.clone())
--- a/packaging/arch/PKGBUILD
+++ b/packaging/arch/PKGBUILD
@ -1,11 +1,11 @@
-# Maintainer: Breadway <rileyhorsham@gmail.com>
+# Maintainer: Breadway <plasticbread849@gmail.com>

 pkgname=breadbox
 pkgver=0.1.0
 pkgrel=1
 pkgdesc="App launcher for Hyprland / Wayland"
 arch=('x86_64')
-url="https://github.com/Breadway/breadbox"
+url="https://git.breadway.dev/Breadway/breadbox"
 license=('MIT')
 # Some Rust deps (ring/mlua) build vendored C/asm into static archives; makepkg's
 # default -flto=auto emits GCC LTO bitcode the Rust (lld) link cannot read,
--- a/packaging/breadbox-sync.service
+++ b/packaging/breadbox-sync.service
@ -1,11 +1,11 @@
 [Unit]
 Description=Breadbox icon sync
-Documentation=https://github.com/breadway/breadbox
+Documentation=https://git.breadway.dev/Breadway/breadbox
 After=network.target

 [Service]
 Type=oneshot
-ExecStart=%h/.cargo/bin/breadbox-sync
+ExecStart=/usr/bin/breadbox-sync
 StandardOutput=journal
 StandardError=journal
 # Allow up to 2 minutes for slow icon downloads
Author	SHA1	Message	Date
Breadway	56070c00c3	Switch to tag-pinned bread-ecosystem deps; bump version to v0.3.0 All checks were successful Mirror to GitHub / mirror (push) Successful in 2s Details release / build (push) Successful in 1m14s Details Build and publish package / package (push) Successful in 1m44s Details	2026-07-19 03:39:39 +08:00
Breadway	50e5a63528	Migrate to bread-utils: Hyprland IPC, single-instance lock, popup scaffold Replaces three hand-rolled pieces of code with the new shared bread-utils crate (path dependency for now, see the TODO in breadbox/Cargo.toml): - get_active_workspace's raw socket1 client -> bread_utils::hypr - toggle_or_continue's TOCTOU-prone PID-file dance -> bread_utils::singleton (flock-based, no read-then-write race) - the layer-shell window setup, Up/Down visible-row navigation, and click-outside-close gesture -> bread_utils::gtk_popup Builds and tests clean across the whole breadbox workspace.	2026-07-17 09:20:06 +08:00
Breadway	a6bba2c362	breadbox: fix packaged systemd unit ExecStart path The PKGBUILD installs breadbox-sync to /usr/bin, but the packaged unit pointed at %h/.cargo/bin/breadbox-sync — a path that only exists for cargo installs. A pacman install shipped a unit that could never find its binary. bakery-based installs already patch ExecStart at install time, so this only affects the pacman channel, but it needed fixing there.	2026-07-17 03:18:38 +08:00
Breadway	006caf0fd5	breadbox: bump version to 0.2.7 All checks were successful Mirror to GitHub / mirror (push) Successful in 1s Details release / build (push) Successful in 1m16s Details Build and publish package / package (push) Successful in 1m54s Details	2026-07-16 18:04:39 +08:00
Breadway	22a6df17b0	breadbox: bump bread-theme to v0.2.10 (fixes pywal-colored window background)	2026-07-16 17:51:57 +08:00
Breadway	eaf3fdc93f	0.2.6: search placeholder text, tighten fuzzy-match noise All checks were successful Mirror to GitHub / mirror (push) Successful in 5s Details release / build (push) Successful in 1m16s Details Build and publish package / package (push) Successful in 1m59s Details Search entry's placeholder read "breadbox" -- the app's own name -- easily mistaken for an already-typed query. Now reads "Search apps...". Bare-subsequence matching (e.g. "zen" matching "Avahi Zeroconf Browser" via z...e...n) surfaced alongside real name-based hits like "Zen Browser". The filter now hides subsequence-only rows whenever a stronger, name-based match exists elsewhere in the results -- that kind of noise now only shows up when it's the best any entry can do. Note: bumping to 0.2.6, not 0.2.5 -- Cargo.toml had drifted one release behind the actual latest tag (v0.2.5 already existed).	2026-07-05 09:15:42 +08:00
Breadway	6385a080f1	CI: migrate release workflow from GitHub Actions to Forgejo Actions All checks were successful Mirror to GitHub / mirror (push) Successful in 2s Details GitHub Actions self-hosted runners need per-repo registration on a personal account; Forgejo Actions' runner already serves every repo with zero setup. Moves release publishing there (dl.breadway.dev stays the primary bakery target; GitHub release upload is kept as the fallback via an explicit token, since Forgejo Actions has no ambient GITHUB_TOKEN) and adds a mirror workflow to keep GitHub in sync automatically.	2026-07-03 14:10:02 +08:00
Breadway	7ece4fd762	CI: use /tmp for ecosystem clone, avoid permissions conflict All checks were successful Mirror to GitHub / mirror (push) Successful in 2s Details	2026-06-19 08:38:38 +08:00