From 45a356eb706f084f52c4378a6a2c39eb166b4fcf Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Sat, 10 Jan 2026 20:18:35 -0500
Subject: [PATCH] Create shared / fast track for certain packages

---
 .../{sync-aur.yml => sync-aur-edge.yml}       |  16 +-
 .github/workflows/sync-aur-shared.yml         |  50 +++++++
 README.md                                     | 111 ++++++++++----
 bin/build                                     |  21 ++-
 bin/check-upstream                            |  16 --
 bin/check-versions                            | 139 ++++++++++++++++++
 bin/sync-aur                                  |  65 +++++---
 build/build.sh                                | 136 ++++++++---------
 build/packages/edge.packages                  |  35 +++++
 build/packages/omarchy-aur.packages           |  60 --------
 build/packages/shared.packages                |  28 ++++
 pkgbuilds/{ => edge}/asdcontrol/.SRCINFO      |   0
 pkgbuilds/{ => edge}/asdcontrol/.gitignore    |   0
 pkgbuilds/{ => edge}/asdcontrol/PKGBUILD      |   0
 .../{ => edge}/asdcontrol/asdcontrol.install  |   0
 .../elephant-archlinuxpkgs/.SRCINFO           |   0
 .../elephant-archlinuxpkgs/PKGBUILD           |   0
 .../{ => edge}/elephant-bluetooth/.SRCINFO    |   0
 .../{ => edge}/elephant-bluetooth/PKGBUILD    |   0
 pkgbuilds/{ => edge}/elephant-calc/.SRCINFO   |   0
 pkgbuilds/{ => edge}/elephant-calc/PKGBUILD   |   0
 .../{ => edge}/elephant-clipboard/.SRCINFO    |   0
 .../{ => edge}/elephant-clipboard/PKGBUILD    |   0
 .../elephant-desktopapplications/.SRCINFO     |   0
 .../elephant-desktopapplications/PKGBUILD     |   0
 pkgbuilds/{ => edge}/elephant-files/.SRCINFO  |   0
 pkgbuilds/{ => edge}/elephant-files/PKGBUILD  |   0
 pkgbuilds/{ => edge}/elephant-menus/.SRCINFO  |   0
 pkgbuilds/{ => edge}/elephant-menus/PKGBUILD  |   0
 .../{ => edge}/elephant-providerlist/.SRCINFO |   0
 .../{ => edge}/elephant-providerlist/PKGBUILD |   0
 pkgbuilds/{ => edge}/elephant-runner/.SRCINFO |   0
 pkgbuilds/{ => edge}/elephant-runner/PKGBUILD |   0
 .../{ => edge}/elephant-symbols/.SRCINFO      |   0
 .../{ => edge}/elephant-symbols/PKGBUILD      |   0
 pkgbuilds/{ => edge}/elephant-todo/.SRCINFO   |   0
 pkgbuilds/{ => edge}/elephant-todo/PKGBUILD   |   0
 .../{ => edge}/elephant-unicode/.SRCINFO      |   0
 .../{ => edge}/elephant-unicode/PKGBUILD      |   0
 .../{ => edge}/elephant-websearch/.SRCINFO    |   0
 .../{ => edge}/elephant-websearch/PKGBUILD    |   0
 pkgbuilds/{ => edge}/elephant/.SRCINFO        |   0
 pkgbuilds/{ => edge}/elephant/.gitignore      |   0
 pkgbuilds/{ => edge}/elephant/PKGBUILD        |   0
 .../{ => edge}/gpu-screen-recorder/.SRCINFO   |   0
 .../{ => edge}/gpu-screen-recorder/PKGBUILD   |   0
 .../gpu-screen-recorder.install               |   0
 .../hyprland-preview-share-picker/PKGBUILD    |   0
 .../lib32-nvidia-580xx-utils/.SRCINFO         |   0
 .../lib32-nvidia-580xx-utils/PKGBUILD         |   0
 .../limine-mkinitcpio-hook/.SRCINFO           |   0
 .../limine-mkinitcpio-hook/.gitignore         |   0
 .../limine-mkinitcpio-hook/PKGBUILD           |   0
 .../{ => edge}/limine-snapper-sync/.SRCINFO   |   0
 .../{ => edge}/limine-snapper-sync/.gitignore |   0
 .../{ => edge}/limine-snapper-sync/PKGBUILD   |   0
 .../macbook12-spi-driver-dkms/.SRCINFO        |   0
 .../macbook12-spi-driver-dkms/.gitignore      |   0
 .../macbook12-spi-driver-dkms/PKGBUILD        |   0
 .../macbook12-spi-driver-dkms/dkms.conf       |   0
 .../{ => edge}/nvidia-580xx-utils/.SRCINFO    |   0
 ...atomic-kernel-modesetting-by-default.patch |   0
 .../{ => edge}/nvidia-580xx-utils/PKGBUILD    |   0
 .../nvidia-580xx-utils/limit-vram-usage       |   0
 .../nvidia-580xx-utils.install                |   0
 .../nvidia-drm-outputclass.conf               |   0
 .../nvidia-580xx-utils/nvidia-sleep.conf      |   0
 .../nvidia-580xx-utils/nvidia-utils.sysusers  |   0
 .../nvidia-580xx-utils/nvidia.rules           |   0
 .../systemd-homed-override.conf               |   0
 .../systemd-suspend-override.conf             |   0
 pkgbuilds/{ => edge}/omarchy-fish/PKGBUILD    |   0
 .../omarchy-fish/omarchy-fish.install         |   0
 pkgbuilds/{ => edge}/omarchy-keyring/.SRCINFO |   0
 pkgbuilds/{ => edge}/omarchy-keyring/PKGBUILD |   0
 .../omarchy-keyring/omarchy-keyring.install   |   0
 .../omarchy-keyring/omarchy-revoked           |   0
 .../omarchy-keyring/omarchy-trusted           |   0
 .../{ => edge}/omarchy-keyring/omarchy.gpg    |   0
 pkgbuilds/{ => edge}/omarchy-nvim/.gitignore  |   0
 pkgbuilds/{ => edge}/omarchy-nvim/PKGBUILD    |   0
 .../{ => edge}/omarchy-nvim/lazyvim.json      |   0
 .../omarchy-nvim/lua/plugins/all-themes.lua   |   0
 .../lua/plugins/disable-news-alert.lua        |   0
 .../lua/plugins/omarchy-theme-hotreload.lua   |   0
 .../plugins/snacks-animated-scrolling-off.lua |   0
 .../omarchy-nvim/omarchy-nvim-setup           |   0
 .../plugin/after/transparency.lua             |   0
 pkgbuilds/{ => edge}/omarchy-walker/PKGBUILD  |   0
 pkgbuilds/{ => edge}/omarchy-zsh/PKGBUILD     |   0
 .../omarchy-zsh/omarchy-zsh.install           |   0
 pkgbuilds/{ => edge}/pinta/.SRCINFO           |   0
 pkgbuilds/{ => edge}/pinta/.gitignore         |   0
 pkgbuilds/{ => edge}/pinta/.nvchecker.toml    |   0
 pkgbuilds/{ => edge}/pinta/PKGBUILD           |   0
 .../python-terminaltexteffects/.SRCINFO       |   0
 .../python-terminaltexteffects/.gitignore     |   0
 .../.nvchecker.toml                           |   0
 .../python-terminaltexteffects/PKGBUILD       |   0
 .../python-terminaltexteffects/fix.patch      |   0
 pkgbuilds/{ => edge}/signal-desktop/.SRCINFO  |   0
 .../{ => edge}/signal-desktop/.nvchecker.toml |   0
 .../{fcitx5 => edge/signal-desktop}/LICENSE   |   0
 .../signal-desktop}/LICENSES/0BSD.txt         |   0
 pkgbuilds/{ => edge}/signal-desktop/PKGBUILD  |   0
 .../{ => edge}/signal-desktop/REUSE.toml      |   0
 .../signal-desktop/TRADEMARK_CONSENT.txt      |   0
 .../signal-desktop/patches/aarch64.patch      |   0
 .../signal-desktop/signal-desktop.desktop     |   0
 pkgbuilds/{ => edge}/tobi-try/PKGBUILD        |   0
 pkgbuilds/{ => edge}/ttf-ia-writer/.SRCINFO   |   0
 .../ttf-ia-writer}/.gitignore                 |   0
 pkgbuilds/{ => edge}/ttf-ia-writer/PKGBUILD   |   0
 pkgbuilds/{ => edge}/typora/.SRCINFO          |   0
 pkgbuilds/{ => edge}/typora/.gitignore        |   0
 pkgbuilds/{ => edge}/typora/Makefile          |   0
 pkgbuilds/{ => edge}/typora/PKGBUILD          |   0
 pkgbuilds/{ => edge}/typora/typora.sh         |   0
 pkgbuilds/{ => edge}/tzupdate/.SRCINFO        |   0
 pkgbuilds/{ => edge}/tzupdate/PKGBUILD        |   0
 pkgbuilds/{ => edge}/ufw-docker/.SRCINFO      |   0
 pkgbuilds/{ => edge}/ufw-docker/.gitignore    |   0
 pkgbuilds/{ => edge}/ufw-docker/PKGBUILD      |   0
 .../{ => edge}/ufw-docker/ufw-docker.install  |   0
 pkgbuilds/{ => edge}/walker/.SRCINFO          |   0
 pkgbuilds/{ => edge}/walker/PKGBUILD          |   0
 pkgbuilds/{ => edge}/wayfreeze/.gitignore     |   0
 pkgbuilds/{ => edge}/wayfreeze/PKGBUILD       |   0
 .../{ => edge}/xdg-terminal-exec/.SRCINFO     |   0
 .../{ => edge}/xdg-terminal-exec/PKGBUILD     |   0
 pkgbuilds/{ => edge}/yaru-icon-theme/PKGBUILD |   0
 pkgbuilds/{ => edge}/yay/.SRCINFO             |   0
 pkgbuilds/{ => edge}/yay/.gitignore           |   0
 pkgbuilds/{ => edge}/yay/PKGBUILD             |   0
 .../{ => edge}/yay/patches/pkg-bump.patch     |   0
 pkgbuilds/fcitx5/.SRCINFO                     |  34 -----
 pkgbuilds/fcitx5/.nvchecker.toml              |   3 -
 pkgbuilds/fcitx5/PKGBUILD                     |  47 ------
 pkgbuilds/fcitx5/REUSE.toml                   |  22 ---
 ...C8A0609AD2A479C65B6D5C8E8B898CBF2412F9.asc |  37 -----
 .../{ => shared}/1password-beta/.SRCINFO      |   0
 .../1password-beta/.gitlab-ci.yml             |   0
 .../1password-beta/1password.install          |   0
 .../{ => shared}/1password-beta/CODEOWNERS    |   0
 .../1password-beta/PATCH_SUMMARY.md           |   0
 .../{ => shared}/1password-beta/PKGBUILD      |   0
 pkgbuilds/{ => shared}/1password-beta/aur.env |   0
 .../1password-beta/patches/README.md          |   0
 .../patches/add-aarch64-support.patch.bak     |   0
 pkgbuilds/{ => shared}/1password-cli/.SRCINFO |   0
 .../{ => shared}/1password-cli/.gitignore     |   0
 .../1password-cli/1password-cli.install       |   0
 pkgbuilds/{ => shared}/1password-cli/PKGBUILD |   0
 .../1password-cli/package-update.sh           |   0
 pkgbuilds/{ => shared}/aether/.SRCINFO        |   0
 pkgbuilds/{ => shared}/aether/PKGBUILD        |   0
 pkgbuilds/{ => shared}/bun-bin/.SRCINFO       |   0
 pkgbuilds/{ => shared}/bun-bin/LICENSE        |   0
 pkgbuilds/{ => shared}/bun-bin/PKGBUILD       |   0
 pkgbuilds/{ => shared}/claude-code/.SRCINFO   |   0
 .../{ => shared}/claude-code/.nvchecker.toml  |   0
 pkgbuilds/{ => shared}/claude-code/PKGBUILD   |   0
 .../claude-code/update-version.sh             |   0
 pkgbuilds/{ => shared}/crush-bin/.SRCINFO     |   0
 pkgbuilds/{ => shared}/crush-bin/PKGBUILD     |   0
 pkgbuilds/{ => shared}/cursor-bin/.SRCINFO    |   8 +-
 pkgbuilds/{ => shared}/cursor-bin/.gitignore  |   0
 pkgbuilds/{ => shared}/cursor-bin/PKGBUILD    |   6 +-
 pkgbuilds/{ => shared}/cursor-bin/rg.sh       |   0
 pkgbuilds/{ => shared}/cursor-cli/.SRCINFO    |   0
 pkgbuilds/{ => shared}/cursor-cli/Cursor-TOS  |   0
 pkgbuilds/{ => shared}/cursor-cli/LICENSE     |   0
 pkgbuilds/{ => shared}/cursor-cli/PKGBUILD    |   0
 .../cursor-cli/cursor-cli.install             |   0
 .../{ => shared}/cursor-cli/update-pkgver.sh  |   0
 pkgbuilds/{ => shared}/dropbox-cli/.SRCINFO   |   0
 pkgbuilds/{ => shared}/dropbox-cli/.gitignore |   0
 pkgbuilds/{ => shared}/dropbox-cli/PKGBUILD   |   0
 .../dropbox-cli/dropboxd-fallback.patch       |   0
 pkgbuilds/{ => shared}/dropbox/.SRCINFO       |   0
 .../{ => shared}/dropbox/.nvchecker.toml      |   0
 .../dropbox/DropboxGlyph_Blue.svg             |   0
 pkgbuilds/{ => shared}/dropbox/PKGBUILD       |   0
 .../{ => shared}/dropbox/dropbox.service      |   0
 .../{ => shared}/dropbox/dropbox@.service     |   0
 pkgbuilds/{ => shared}/dropbox/terms.txt      |   0
 .../{ => shared}/github-copilot-cli/.SRCINFO  |   0
 .../github-copilot-cli/.gitignore             |   0
 .../github-copilot-cli/.nvchecker.toml        |   0
 .../{ => shared}/github-copilot-cli/PKGBUILD  |   0
 .../github-copilot-cli/changelog.md           |   0
 pkgbuilds/{ => shared}/hyprshade/.SRCINFO     |   0
 .../hyprshade}/.gitignore                     |   0
 pkgbuilds/{ => shared}/hyprshade/PKGBUILD     |   0
 pkgbuilds/{ => shared}/lmstudio/.SRCINFO      |   0
 .../{ => shared}/lmstudio/.nvchecker.toml     |   0
 pkgbuilds/{ => shared}/lmstudio/PKGBUILD      |   0
 pkgbuilds/{ => shared}/localsend-bin/.SRCINFO |   0
 pkgbuilds/{ => shared}/localsend-bin/PKGBUILD |   0
 pkgbuilds/{ => shared}/localsend/.SRCINFO     |   0
 pkgbuilds/{ => shared}/localsend/.gitignore   |   0
 pkgbuilds/{ => shared}/localsend/PKGBUILD     |   0
 .../{ => shared}/minecraft-launcher/.SRCINFO  |   0
 .../minecraft-launcher/.gitignore             |   0
 .../{ => shared}/minecraft-launcher/PKGBUILD  |   0
 .../minecraft-launcher.desktop                |   0
 .../minecraft-launcher/minecraft-launcher.sh  |   0
 .../{ => shared}/nautilus-dropbox/.SRCINFO    |   0
 .../{ => shared}/nautilus-dropbox/PKGBUILD    |   0
 .../omarchy-chromium-bin/.SRCINFO             |   0
 .../omarchy-chromium-bin/PKGBUILD             |   0
 .../{ => shared}/openai-codex-bin/.SRCINFO    |   0
 .../{ => shared}/openai-codex-bin/PKGBUILD    |   0
 pkgbuilds/{ => shared}/opencode/.SRCINFO      |   4 +-
 pkgbuilds/{ => shared}/opencode/PKGBUILD      |   4 +-
 .../opencode/patches/bun-version-check.patch  |   0
 pkgbuilds/{ => shared}/spotify/.SRCINFO       |   0
 pkgbuilds/{ => shared}/spotify/LICENSE        |   0
 pkgbuilds/{ => shared}/spotify/PKGBUILD       |   0
 ...20FD3777CCE3A7F0076B55C85668DF69375001.asc |   0
 ...096BCBFF6D418796DE78515384CE82BA52C83A.asc | Bin
 .../{ => shared}/spotify/spotify.protocol     |   0
 pkgbuilds/{ => shared}/spotify/spotify.sh     |   0
 .../{ => shared}/sublime-text-4/.SRCINFO      |   0
 .../{ => shared}/sublime-text-4/PKGBUILD      |   0
 .../sublime-text-4/sublime-text-4.sh          |   0
 pkgbuilds/{ => shared}/symfony-cli/.SRCINFO   |   0
 pkgbuilds/{ => shared}/symfony-cli/.gitignore |   0
 pkgbuilds/{ => shared}/symfony-cli/LICENSE    |   0
 pkgbuilds/{ => shared}/symfony-cli/PKGBUILD   |   0
 pkgbuilds/{ => shared}/symfony-cli/README.md  |   0
 pkgbuilds/{ => shared}/symfony-cli/update.sh  |   0
 .../visual-studio-code-bin/.SRCINFO           |   0
 .../visual-studio-code-bin/.gitignore         |   0
 .../visual-studio-code-bin/PKGBUILD           |   0
 .../visual-studio-code-bin.install            |   0
 .../visual-studio-code-bin.sh                 |   0
 pkgbuilds/shared/voxtype-bin/.SRCINFO         |  45 ++++++
 pkgbuilds/{ => shared}/voxtype-bin/.gitignore |   0
 .../{ => shared}/voxtype-bin/.nvchecker.toml  |   0
 pkgbuilds/{ => shared}/voxtype-bin/PKGBUILD   |  10 +-
 .../voxtype-bin/voxtype-bin.install           |   7 +-
 pkgbuilds/signal-desktop/LICENSE              |  12 --
 pkgbuilds/signal-desktop/LICENSES/0BSD.txt    |   1 -
 pkgbuilds/voxtype-bin/.SRCINFO                |  45 ------
 systemd/omarchy-auto-release-edge.service     |   2 +-
 systemd/omarchy-auto-release-edge.timer       |   6 +-
 systemd/omarchy-auto-release-stable.service   |   2 +-
 systemd/omarchy-auto-release-stable.timer     |   6 +-
 systemd/omarchy-check-upstream.service        |  13 --
 systemd/omarchy-check-upstream.timer          |   9 --
 systemd/omarchy-check-versions.service        |  14 ++
 systemd/omarchy-check-versions.timer          |  10 ++
 253 files changed, 566 insertions(+), 458 deletions(-)
 rename .github/workflows/{sync-aur.yml => sync-aur-edge.yml} (76%)
 create mode 100644 .github/workflows/sync-aur-shared.yml
 delete mode 100755 bin/check-upstream
 create mode 100755 bin/check-versions
 create mode 100644 build/packages/edge.packages
 delete mode 100644 build/packages/omarchy-aur.packages
 create mode 100644 build/packages/shared.packages
 rename pkgbuilds/{ => edge}/asdcontrol/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/asdcontrol/.gitignore (100%)
 rename pkgbuilds/{ => edge}/asdcontrol/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/asdcontrol/asdcontrol.install (100%)
 rename pkgbuilds/{ => edge}/elephant-archlinuxpkgs/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-archlinuxpkgs/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-bluetooth/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-bluetooth/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-calc/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-calc/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-clipboard/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-clipboard/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-desktopapplications/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-desktopapplications/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-files/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-files/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-menus/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-menus/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-providerlist/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-providerlist/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-runner/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-runner/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-symbols/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-symbols/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-todo/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-todo/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-unicode/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-unicode/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant-websearch/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant-websearch/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/elephant/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/elephant/.gitignore (100%)
 rename pkgbuilds/{ => edge}/elephant/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/gpu-screen-recorder/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/gpu-screen-recorder/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/gpu-screen-recorder/gpu-screen-recorder.install (100%)
 rename pkgbuilds/{ => edge}/hyprland-preview-share-picker/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/lib32-nvidia-580xx-utils/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/lib32-nvidia-580xx-utils/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/limine-mkinitcpio-hook/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/limine-mkinitcpio-hook/.gitignore (100%)
 rename pkgbuilds/{ => edge}/limine-mkinitcpio-hook/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/limine-snapper-sync/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/limine-snapper-sync/.gitignore (100%)
 rename pkgbuilds/{ => edge}/limine-snapper-sync/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/macbook12-spi-driver-dkms/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/macbook12-spi-driver-dkms/.gitignore (100%)
 rename pkgbuilds/{ => edge}/macbook12-spi-driver-dkms/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/macbook12-spi-driver-dkms/dkms.conf (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/0001-Enable-atomic-kernel-modesetting-by-default.patch (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/limit-vram-usage (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/nvidia-580xx-utils.install (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/nvidia-drm-outputclass.conf (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/nvidia-sleep.conf (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/nvidia-utils.sysusers (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/nvidia.rules (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/systemd-homed-override.conf (100%)
 rename pkgbuilds/{ => edge}/nvidia-580xx-utils/systemd-suspend-override.conf (100%)
 rename pkgbuilds/{ => edge}/omarchy-fish/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/omarchy-fish/omarchy-fish.install (100%)
 rename pkgbuilds/{ => edge}/omarchy-keyring/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/omarchy-keyring/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/omarchy-keyring/omarchy-keyring.install (100%)
 rename pkgbuilds/{ => edge}/omarchy-keyring/omarchy-revoked (100%)
 rename pkgbuilds/{ => edge}/omarchy-keyring/omarchy-trusted (100%)
 rename pkgbuilds/{ => edge}/omarchy-keyring/omarchy.gpg (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/.gitignore (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/lazyvim.json (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/lua/plugins/all-themes.lua (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/lua/plugins/disable-news-alert.lua (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/lua/plugins/snacks-animated-scrolling-off.lua (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/omarchy-nvim-setup (100%)
 rename pkgbuilds/{ => edge}/omarchy-nvim/plugin/after/transparency.lua (100%)
 rename pkgbuilds/{ => edge}/omarchy-walker/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/omarchy-zsh/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/omarchy-zsh/omarchy-zsh.install (100%)
 rename pkgbuilds/{ => edge}/pinta/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/pinta/.gitignore (100%)
 rename pkgbuilds/{ => edge}/pinta/.nvchecker.toml (100%)
 rename pkgbuilds/{ => edge}/pinta/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/python-terminaltexteffects/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/python-terminaltexteffects/.gitignore (100%)
 rename pkgbuilds/{ => edge}/python-terminaltexteffects/.nvchecker.toml (100%)
 rename pkgbuilds/{ => edge}/python-terminaltexteffects/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/python-terminaltexteffects/fix.patch (100%)
 rename pkgbuilds/{ => edge}/signal-desktop/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/signal-desktop/.nvchecker.toml (100%)
 rename pkgbuilds/{fcitx5 => edge/signal-desktop}/LICENSE (100%)
 rename pkgbuilds/{fcitx5 => edge/signal-desktop}/LICENSES/0BSD.txt (100%)
 rename pkgbuilds/{ => edge}/signal-desktop/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/signal-desktop/REUSE.toml (100%)
 rename pkgbuilds/{ => edge}/signal-desktop/TRADEMARK_CONSENT.txt (100%)
 rename pkgbuilds/{ => edge}/signal-desktop/patches/aarch64.patch (100%)
 rename pkgbuilds/{ => edge}/signal-desktop/signal-desktop.desktop (100%)
 rename pkgbuilds/{ => edge}/tobi-try/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/ttf-ia-writer/.SRCINFO (100%)
 rename pkgbuilds/{hyprshade => edge/ttf-ia-writer}/.gitignore (100%)
 rename pkgbuilds/{ => edge}/ttf-ia-writer/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/typora/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/typora/.gitignore (100%)
 rename pkgbuilds/{ => edge}/typora/Makefile (100%)
 rename pkgbuilds/{ => edge}/typora/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/typora/typora.sh (100%)
 rename pkgbuilds/{ => edge}/tzupdate/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/tzupdate/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/ufw-docker/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/ufw-docker/.gitignore (100%)
 rename pkgbuilds/{ => edge}/ufw-docker/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/ufw-docker/ufw-docker.install (100%)
 rename pkgbuilds/{ => edge}/walker/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/walker/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/wayfreeze/.gitignore (100%)
 rename pkgbuilds/{ => edge}/wayfreeze/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/xdg-terminal-exec/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/xdg-terminal-exec/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/yaru-icon-theme/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/yay/.SRCINFO (100%)
 rename pkgbuilds/{ => edge}/yay/.gitignore (100%)
 rename pkgbuilds/{ => edge}/yay/PKGBUILD (100%)
 rename pkgbuilds/{ => edge}/yay/patches/pkg-bump.patch (100%)
 delete mode 100644 pkgbuilds/fcitx5/.SRCINFO
 delete mode 100644 pkgbuilds/fcitx5/.nvchecker.toml
 delete mode 100644 pkgbuilds/fcitx5/PKGBUILD
 delete mode 100644 pkgbuilds/fcitx5/REUSE.toml
 delete mode 100644 pkgbuilds/fcitx5/keys/pgp/2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9.asc
 rename pkgbuilds/{ => shared}/1password-beta/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/1password-beta/.gitlab-ci.yml (100%)
 rename pkgbuilds/{ => shared}/1password-beta/1password.install (100%)
 rename pkgbuilds/{ => shared}/1password-beta/CODEOWNERS (100%)
 rename pkgbuilds/{ => shared}/1password-beta/PATCH_SUMMARY.md (100%)
 rename pkgbuilds/{ => shared}/1password-beta/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/1password-beta/aur.env (100%)
 rename pkgbuilds/{ => shared}/1password-beta/patches/README.md (100%)
 rename pkgbuilds/{ => shared}/1password-beta/patches/add-aarch64-support.patch.bak (100%)
 rename pkgbuilds/{ => shared}/1password-cli/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/1password-cli/.gitignore (100%)
 rename pkgbuilds/{ => shared}/1password-cli/1password-cli.install (100%)
 rename pkgbuilds/{ => shared}/1password-cli/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/1password-cli/package-update.sh (100%)
 rename pkgbuilds/{ => shared}/aether/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/aether/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/bun-bin/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/bun-bin/LICENSE (100%)
 rename pkgbuilds/{ => shared}/bun-bin/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/claude-code/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/claude-code/.nvchecker.toml (100%)
 rename pkgbuilds/{ => shared}/claude-code/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/claude-code/update-version.sh (100%)
 rename pkgbuilds/{ => shared}/crush-bin/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/crush-bin/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/cursor-bin/.SRCINFO (69%)
 rename pkgbuilds/{ => shared}/cursor-bin/.gitignore (100%)
 rename pkgbuilds/{ => shared}/cursor-bin/PKGBUILD (89%)
 rename pkgbuilds/{ => shared}/cursor-bin/rg.sh (100%)
 rename pkgbuilds/{ => shared}/cursor-cli/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/cursor-cli/Cursor-TOS (100%)
 rename pkgbuilds/{ => shared}/cursor-cli/LICENSE (100%)
 rename pkgbuilds/{ => shared}/cursor-cli/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/cursor-cli/cursor-cli.install (100%)
 rename pkgbuilds/{ => shared}/cursor-cli/update-pkgver.sh (100%)
 rename pkgbuilds/{ => shared}/dropbox-cli/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/dropbox-cli/.gitignore (100%)
 rename pkgbuilds/{ => shared}/dropbox-cli/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/dropbox-cli/dropboxd-fallback.patch (100%)
 rename pkgbuilds/{ => shared}/dropbox/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/dropbox/.nvchecker.toml (100%)
 rename pkgbuilds/{ => shared}/dropbox/DropboxGlyph_Blue.svg (100%)
 rename pkgbuilds/{ => shared}/dropbox/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/dropbox/dropbox.service (100%)
 rename pkgbuilds/{ => shared}/dropbox/dropbox@.service (100%)
 rename pkgbuilds/{ => shared}/dropbox/terms.txt (100%)
 rename pkgbuilds/{ => shared}/github-copilot-cli/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/github-copilot-cli/.gitignore (100%)
 rename pkgbuilds/{ => shared}/github-copilot-cli/.nvchecker.toml (100%)
 rename pkgbuilds/{ => shared}/github-copilot-cli/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/github-copilot-cli/changelog.md (100%)
 rename pkgbuilds/{ => shared}/hyprshade/.SRCINFO (100%)
 rename pkgbuilds/{ttf-ia-writer => shared/hyprshade}/.gitignore (100%)
 rename pkgbuilds/{ => shared}/hyprshade/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/lmstudio/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/lmstudio/.nvchecker.toml (100%)
 rename pkgbuilds/{ => shared}/lmstudio/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/localsend-bin/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/localsend-bin/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/localsend/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/localsend/.gitignore (100%)
 rename pkgbuilds/{ => shared}/localsend/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/minecraft-launcher/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/minecraft-launcher/.gitignore (100%)
 rename pkgbuilds/{ => shared}/minecraft-launcher/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/minecraft-launcher/minecraft-launcher.desktop (100%)
 rename pkgbuilds/{ => shared}/minecraft-launcher/minecraft-launcher.sh (100%)
 rename pkgbuilds/{ => shared}/nautilus-dropbox/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/nautilus-dropbox/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/omarchy-chromium-bin/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/omarchy-chromium-bin/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/openai-codex-bin/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/openai-codex-bin/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/opencode/.SRCINFO (76%)
 rename pkgbuilds/{ => shared}/opencode/PKGBUILD (95%)
 rename pkgbuilds/{ => shared}/opencode/patches/bun-version-check.patch (100%)
 rename pkgbuilds/{ => shared}/spotify/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/spotify/LICENSE (100%)
 rename pkgbuilds/{ => shared}/spotify/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/spotify/keys/pgp/B420FD3777CCE3A7F0076B55C85668DF69375001.asc (100%)
 rename pkgbuilds/{ => shared}/spotify/keys/pgp/E1096BCBFF6D418796DE78515384CE82BA52C83A.asc (100%)
 rename pkgbuilds/{ => shared}/spotify/spotify.protocol (100%)
 rename pkgbuilds/{ => shared}/spotify/spotify.sh (100%)
 rename pkgbuilds/{ => shared}/sublime-text-4/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/sublime-text-4/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/sublime-text-4/sublime-text-4.sh (100%)
 rename pkgbuilds/{ => shared}/symfony-cli/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/symfony-cli/.gitignore (100%)
 rename pkgbuilds/{ => shared}/symfony-cli/LICENSE (100%)
 rename pkgbuilds/{ => shared}/symfony-cli/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/symfony-cli/README.md (100%)
 rename pkgbuilds/{ => shared}/symfony-cli/update.sh (100%)
 rename pkgbuilds/{ => shared}/visual-studio-code-bin/.SRCINFO (100%)
 rename pkgbuilds/{ => shared}/visual-studio-code-bin/.gitignore (100%)
 rename pkgbuilds/{ => shared}/visual-studio-code-bin/PKGBUILD (100%)
 rename pkgbuilds/{ => shared}/visual-studio-code-bin/visual-studio-code-bin.install (100%)
 rename pkgbuilds/{ => shared}/visual-studio-code-bin/visual-studio-code-bin.sh (100%)
 create mode 100644 pkgbuilds/shared/voxtype-bin/.SRCINFO
 rename pkgbuilds/{ => shared}/voxtype-bin/.gitignore (100%)
 rename pkgbuilds/{ => shared}/voxtype-bin/.nvchecker.toml (100%)
 rename pkgbuilds/{ => shared}/voxtype-bin/PKGBUILD (92%)
 rename pkgbuilds/{ => shared}/voxtype-bin/voxtype-bin.install (89%)
 delete mode 100644 pkgbuilds/signal-desktop/LICENSE
 delete mode 120000 pkgbuilds/signal-desktop/LICENSES/0BSD.txt
 delete mode 100644 pkgbuilds/voxtype-bin/.SRCINFO
 delete mode 100644 systemd/omarchy-check-upstream.service
 delete mode 100644 systemd/omarchy-check-upstream.timer
 create mode 100644 systemd/omarchy-check-versions.service
 create mode 100644 systemd/omarchy-check-versions.timer

diff --git a/.github/workflows/sync-aur.yml b/.github/workflows/sync-aur-edge.yml
similarity index 76%
rename from .github/workflows/sync-aur.yml
rename to .github/workflows/sync-aur-edge.yml
index efd3b22..0891dfb 100644
--- a/.github/workflows/sync-aur.yml
+++ b/.github/workflows/sync-aur-edge.yml
@@ -1,4 +1,4 @@
-name: Sync AUR Packages
+name: Sync AUR Packages (Edge)
 
 on:
   schedule:
@@ -22,12 +22,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Sync AUR packages
+      - name: Sync AUR packages (edge tier)
         run: |
           if [ -n "$PACKAGES" ]; then
-            ./bin/sync-aur $PACKAGES
+            ./bin/sync-aur --tier edge $PACKAGES
           else
-            ./bin/sync-aur
+            ./bin/sync-aur --tier edge
           fi
         env:
           PACKAGES: ${{ github.event.inputs.packages }}
@@ -46,13 +46,13 @@ jobs:
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: 'chore: sync AUR packages'
-          title: 'chore: sync AUR packages'
+          commit-message: 'chore: sync AUR packages (edge)'
+          title: 'chore: sync AUR packages (edge)'
           body: |
-            Automated AUR package sync.
+            Automated AUR package sync for edge tier.
 
             Please review the changes before merging.
-          branch: auto/sync-aur
+          branch: auto/sync-aur-edge
           delete-branch: true
           labels: automated
           reviewers: ryanrhughes
diff --git a/.github/workflows/sync-aur-shared.yml b/.github/workflows/sync-aur-shared.yml
new file mode 100644
index 0000000..652afbd
--- /dev/null
+++ b/.github/workflows/sync-aur-shared.yml
@@ -0,0 +1,50 @@
+name: Sync AUR Packages (Shared)
+
+on:
+  schedule:
+    # Every 6 hours
+    - cron: '0 */6 * * *'
+  workflow_dispatch:
+    inputs:
+      packages:
+        description: 'Specific packages to sync (space-separated, leave empty for all)'
+        required: false
+        default: ''
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Sync AUR packages (shared tier)
+        run: |
+          if [ -n "$PACKAGES" ]; then
+            ./bin/sync-aur --tier shared $PACKAGES
+          else
+            ./bin/sync-aur --tier shared
+          fi
+        env:
+          PACKAGES: ${{ github.event.inputs.packages }}
+
+      - name: Check for changes
+        id: changes
+        run: |
+          if git diff --quiet; then
+            echo "has_changes=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "has_changes=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Commit and push changes
+        if: steps.changes.outputs.has_changes == 'true'
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add -A
+          git commit -m "chore: sync AUR packages (shared)"
+          git push
diff --git a/README.md b/README.md
index 434b6c5..f929d3c 100644
--- a/README.md
+++ b/README.md
@@ -129,38 +129,81 @@ bin/repo remove <package>           # Remove package
 
 ```
 omarchy-pkgs/
-├── pkgbuilds/              # Source PKGBUILDs
-├── build-output/           # Unsigned packages (temporary)
-│   ├── x86_64/
-│   └── aarch64/
-├── pkgs.omarchy.org/       # Signed packages (production)
-│   ├── x86_64/
-│   └── aarch64/
-├── build/                  # Build scripts (in container)
-└── bin/                    # CLI tools (on host)
+├── pkgbuilds/                  # Source PKGBUILDs (tiered)
+│   ├── stable/                 # Manual promotion only, builds for stable
+│   ├── edge/                   # Daily sync w/ PR review, builds for edge only
+│   └── shared/                 # 6-hourly sync, auto-merge, builds for BOTH
+├── build/
+│   └── packages/
+│       ├── edge.packages       # Package list for daily sync (PR review)
+│       └── shared.packages     # Package list for 6-hourly sync (auto-merge)
+├── build-output/               # Unsigned packages (temporary)
+│   ├── edge/
+│   │   ├── x86_64/
+│   │   └── aarch64/
+│   └── stable/
+│       ├── x86_64/
+│       └── aarch64/
+├── pkgs.omarchy.org/           # Signed packages (production)
+│   ├── edge/
+│   │   ├── x86_64/
+│   │   └── aarch64/
+│   └── stable/
+│       ├── x86_64/
+│       └── aarch64/
+└── bin/                        # CLI tools (on host)
 ```
 
+## Package Tiers
+
+Packages are organized into three tiers based on their release cadence:
+
+| Tier | Directory | Sync Frequency | Review | Builds To |
+|------|-----------|----------------|--------|-----------|
+| **Stable** | `pkgbuilds/stable/` | Manual | N/A | stable only |
+| **Edge** | `pkgbuilds/edge/` | Daily | PR required | edge only |
+| **Shared** | `pkgbuilds/shared/` | Every 6 hours | Auto-merge | edge AND stable |
+
+### Build Matrix
+
+- **Edge builds** (`--mirror edge`): `pkgbuilds/edge/*` + `pkgbuilds/shared/*`
+- **Stable builds** (`--mirror stable`): `pkgbuilds/stable/*` + `pkgbuilds/shared/*`
+
 ## Adding Packages
 
-### From AUR
+### From AUR (Edge - Daily Sync, PR Review)
 
 ```bash
-# Add to sync list
-echo "package-name" >> build/packages/omarchy-aur.packages
+# Add to edge package list
+echo "package-name" >> build/packages/edge.packages
 
 # Sync PKGBUILD
-bin/sync-aur package-name
+bin/sync-aur --tier edge package-name
 
 # Build and release
 bin/repo release --package package-name
 ```
 
-#### Local Patches for AUR Packages
-
-Create `pkgbuilds/package-name/patches/*.patch` to maintain modifications across AUR syncs:
+### From AUR (Shared - 6-Hourly Sync, Auto-Merge)
 
 ```bash
-cd pkgbuilds/package-name
+# Add to shared package list
+echo "package-name" >> build/packages/shared.packages
+
+# Sync PKGBUILD
+bin/sync-aur --tier shared package-name
+
+# Build and release (will publish to both edge and stable)
+bin/repo release --package package-name
+bin/repo release --mirror stable --package package-name
+```
+
+### Local Patches for AUR Packages
+
+Create `pkgbuilds/<tier>/package-name/patches/*.patch` to maintain modifications across AUR syncs:
+
+```bash
+cd pkgbuilds/edge/package-name
 # Make changes
 git diff > patches/my-fix.patch
 # Next sync will auto-apply patches
@@ -169,7 +212,7 @@ git diff > patches/my-fix.patch
 ### Custom Package
 
 ```bash
-mkdir pkgbuilds/my-package
+mkdir pkgbuilds/edge/my-package
 # Add PKGBUILD and files
 bin/repo release --package my-package
 ```
@@ -218,19 +261,33 @@ Packages are only rebuilt if:
 
 ## Automated Releases
 
-The repository includes a GitHub workflow and systemd services for automated daily releases.
+The repository includes GitHub workflows and systemd services for automated releases.
 
 ### How It Works
 
-1. **GitHub Action** (6:00 AM UTC): Syncs AUR packages and opens a PR if there are updates
-2. **Merge PR**: Review and merge the PR to trigger the release pipeline
-3. **check-upstream** (2:00 PM Eastern): Detects the merged changes, pulls them, creates state files
-4. **auto-release** (3:00 PM Eastern): If state file exists, runs full release workflow and removes state file on success
+#### GitHub Workflows
+
+1. **sync-aur-edge.yml** (Daily at 6:00 AM UTC): Syncs edge packages from AUR, creates PR for review
+2. **sync-aur-shared.yml** (Every 6 hours): Syncs shared packages from AUR, auto-commits to master
+
+#### Systemd Services
+
+1. **check-versions** (Every 6 hours at :30): Compares PKGBUILD versions to published versions, creates state files if builds are needed
+2. **auto-release-edge** (Every 6 hours at +1:00): If state file exists, builds edge packages
+3. **auto-release-stable** (Every 6 hours at +1:30): If state file exists, builds stable packages
 
 State files are stored in `/root/.state/`:
 - `.sync-needed-edge`
 - `.sync-needed-stable`
 
+### Schedule (America/New_York)
+
+| Time | Action |
+|------|--------|
+| 00:30, 06:30, 12:30, 18:30 | check-versions (creates state files) |
+| 01:00, 07:00, 13:00, 19:00 | auto-release-edge |
+| 01:30, 07:30, 13:30, 19:30 | auto-release-stable |
+
 ### Installation
 
 ```bash
@@ -241,7 +298,7 @@ cp /root/omarchy-pkgs/systemd/*.service /root/omarchy-pkgs/systemd/*.timer /etc/
 systemctl daemon-reload
 
 # Enable and start timers
-systemctl enable --now omarchy-check-upstream.timer
+systemctl enable --now omarchy-check-versions.timer
 systemctl enable --now omarchy-auto-release-edge.timer
 systemctl enable --now omarchy-auto-release-stable.timer
 
@@ -256,10 +313,12 @@ mkdir -p /root/.state
 systemctl list-timers omarchy-*
 
 # Manual trigger
-systemctl start omarchy-check-upstream.service
+systemctl start omarchy-check-versions.service
 systemctl start omarchy-auto-release-edge.service
+systemctl start omarchy-auto-release-stable.service
 
 # View logs
-journalctl -u omarchy-check-upstream.service
+journalctl -u omarchy-check-versions.service
 journalctl -u omarchy-auto-release-edge.service
+journalctl -u omarchy-auto-release-stable.service
 ```
diff --git a/bin/build b/bin/build
index a896df7..7f78761 100755
--- a/bin/build
+++ b/bin/build
@@ -52,12 +52,12 @@ while [[ $# -gt 0 ]]; do
     echo "  --package <names>    Build only the specified package(s) (space-separated)"
     echo "  -h, --help           Show this help message"
     echo ""
-    echo "This script builds AUR packages from:"
-    echo "  build/packages/omarchy-aur.packages"
+    echo "This script builds packages from pkgbuilds/ directories based on mirror:"
+    echo "  --mirror edge:   builds from pkgbuilds/edge/ + pkgbuilds/shared/"
+    echo "  --mirror stable: builds from pkgbuilds/stable/ + pkgbuilds/shared/"
     echo ""
-    echo "Or build a single package with --package:"
-    echo "  Package can be: AUR package, GitHub repo (owner/repo), or local PKGBUILD"
-    echo "  Options can be appended after package name (skip-pgp, install, always-build, etc.)"
+    echo "Or build specific packages with --package:"
+    echo "  Package names should match directories in the relevant pkgbuilds/ tier"
     echo ""
     echo "Examples:"
     echo "  $0 --arch aarch64"
@@ -94,14 +94,11 @@ print_info "Cleaning build workspace..."
 rm -rf "$BUILD_OUTPUT_DIR"/*
 mkdir -p "$BUILD_OUTPUT_DIR"
 
-# Check if AUR package list exists (only required if not building specific packages)
-if [[ -z "$PACKAGES" ]]; then
-  if [[ ! -f "$BUILD_DIR/packages/omarchy-aur.packages" ]]; then
-    print_error "omarchy-aur.packages not found at $BUILD_DIR/packages/"
-    exit 1
-  fi
-else
+# Show package info
+if [[ -n "$PACKAGES" ]]; then
   print_info "Building packages: $PACKAGES"
+else
+  print_info "Building all packages for $MIRROR mirror"
 fi
 
 # Build/update the Docker image
diff --git a/bin/check-upstream b/bin/check-upstream
deleted file mode 100755
index 73fbabc..0000000
--- a/bin/check-upstream
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# Check for upstream changes and create state files if updates were pulled
-set -e
-
-REPO_DIR=/root/omarchy-pkgs
-STATE_DIR=/root/.state
-
-mkdir -p "$STATE_DIR"
-cd "$REPO_DIR"
-
-git fetch origin master --quiet
-
-if [[ $(git rev-parse HEAD) != $(git rev-parse origin/master) ]]; then
-  git pull --ff-only origin master
-  touch "$STATE_DIR/.sync-needed-edge"
-fi
diff --git a/bin/check-versions b/bin/check-versions
new file mode 100755
index 0000000..dc4bdbe
--- /dev/null
+++ b/bin/check-versions
@@ -0,0 +1,139 @@
+#!/bin/bash
+# Check PKGBUILD versions against published repo versions
+# Creates state files for edge and/or stable if any packages need building
+
+set -e
+
+BUILD_ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..")
+source "$BUILD_ROOT/helpers/message-helpers.sh"
+source "$BUILD_ROOT/helpers/paths.sh"
+
+STATE_DIR="${OMARCHY_STATE_DIR:-/root/.state}"
+ARCH="${ARCH:-x86_64}"
+
+# Ensure state directory exists
+mkdir -p "$STATE_DIR"
+
+print_header "Package Version Check"
+
+# Get version from repo database
+get_repo_version() {
+  local pkg="$1"
+  local mirror="$2"
+  local repo_db="$BUILD_ROOT/pkgs.omarchy.org/$mirror/$ARCH/omarchy.db.tar.zst"
+  
+  if [[ -f "$repo_db" ]]; then
+    local desc_file=$(tar -tf "$repo_db" 2>/dev/null | grep "^${pkg}-[0-9r].*/desc$" | head -1)
+    if [[ -n "$desc_file" ]]; then
+      tar -xOf "$repo_db" "$desc_file" 2>/dev/null | awk '/%VERSION%/{getline; print; exit}'
+    fi
+  fi
+}
+
+# Get version from PKGBUILD
+get_pkgbuild_version() {
+  local pkgdir="$1"
+  if [[ -f "$pkgdir/PKGBUILD" ]]; then
+    (cd "$pkgdir" && bash -c 'source PKGBUILD 2>/dev/null; if [[ -n "$epoch" ]]; then echo "${epoch}:${pkgver}-${pkgrel}"; else echo "${pkgver}-${pkgrel}"; fi')
+  fi
+}
+
+# Check if package needs building for a mirror
+check_package() {
+  local pkg="$1"
+  local pkgdir="$2"
+  local mirror="$3"
+  
+  local pkgbuild_version=$(get_pkgbuild_version "$pkgdir")
+  local repo_version=$(get_repo_version "$pkg" "$mirror")
+  
+  if [[ -z "$pkgbuild_version" ]]; then
+    return 1  # Can't read version, skip
+  fi
+  
+  if [[ "$pkgbuild_version" != "$repo_version" ]]; then
+    return 0  # Needs building
+  fi
+  
+  return 1  # Up to date
+}
+
+edge_needs_build=false
+stable_needs_build=false
+edge_packages=()
+stable_packages=()
+
+print_info "Checking edge packages..."
+
+# Check edge/ packages -> only affects edge
+for pkgdir in "$BUILD_ROOT/pkgbuilds/edge"/*/; do
+  [[ ! -d "$pkgdir" ]] && continue
+  pkg=$(basename "$pkgdir")
+  [[ ! -f "$pkgdir/PKGBUILD" ]] && continue
+  
+  if check_package "$pkg" "$pkgdir" "edge"; then
+    edge_needs_build=true
+    edge_packages+=("$pkg")
+  fi
+done
+
+print_info "Checking stable packages..."
+
+# Check stable/ packages -> only affects stable
+for pkgdir in "$BUILD_ROOT/pkgbuilds/stable"/*/; do
+  [[ ! -d "$pkgdir" ]] && continue
+  pkg=$(basename "$pkgdir")
+  [[ ! -f "$pkgdir/PKGBUILD" ]] && continue
+  
+  if check_package "$pkg" "$pkgdir" "stable"; then
+    stable_needs_build=true
+    stable_packages+=("$pkg")
+  fi
+done
+
+print_info "Checking shared packages..."
+
+# Check shared/ packages -> affects BOTH edge and stable
+for pkgdir in "$BUILD_ROOT/pkgbuilds/shared"/*/; do
+  [[ ! -d "$pkgdir" ]] && continue
+  pkg=$(basename "$pkgdir")
+  [[ ! -f "$pkgdir/PKGBUILD" ]] && continue
+  
+  # Check against edge
+  if check_package "$pkg" "$pkgdir" "edge"; then
+    edge_needs_build=true
+    edge_packages+=("$pkg")
+  fi
+  
+  # Check against stable
+  if check_package "$pkg" "$pkgdir" "stable"; then
+    stable_needs_build=true
+    stable_packages+=("$pkg")
+  fi
+done
+
+echo ""
+
+# Drop state files as needed
+if [[ "$edge_needs_build" == true ]]; then
+  touch "$STATE_DIR/.sync-needed-edge"
+  print_success "Edge needs building (${#edge_packages[@]} packages)"
+  print_info "Packages: ${edge_packages[*]}"
+  print_info "State file created: $STATE_DIR/.sync-needed-edge"
+else
+  print_info "Edge is up to date"
+fi
+
+echo ""
+
+if [[ "$stable_needs_build" == true ]]; then
+  touch "$STATE_DIR/.sync-needed-stable"
+  print_success "Stable needs building (${#stable_packages[@]} packages)"
+  print_info "Packages: ${stable_packages[*]}"
+  print_info "State file created: $STATE_DIR/.sync-needed-stable"
+else
+  print_info "Stable is up to date"
+fi
+
+echo ""
+print_success "Version check complete!"
diff --git a/bin/sync-aur b/bin/sync-aur
index 5eca91b..80549f7 100755
--- a/bin/sync-aur
+++ b/bin/sync-aur
@@ -4,38 +4,64 @@ BUILD_ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..")
 source "$BUILD_ROOT/helpers/message-helpers.sh"
 source "$BUILD_ROOT/helpers/paths.sh"
 
-PACKAGES_FILE="$BUILD_ROOT/build/packages/omarchy-aur.packages"
 TEMP_DIR=$(mktemp -d)
 
 trap "rm -rf $TEMP_DIR" EXIT
 
-# Parse arguments
+# Default tier
+TIER=""
 SPECIFIC_PACKAGES=()
-for arg in "$@"; do
-  case "$arg" in
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --tier)
+      TIER="$2"
+      if [[ "$TIER" != "edge" && "$TIER" != "shared" ]]; then
+        print_error "Invalid tier: $TIER (must be 'edge' or 'shared')"
+        exit 1
+      fi
+      shift 2
+      ;;
     -h|--help)
-      echo "Usage: $0 [PACKAGE...]"
+      echo "Usage: $0 --tier <edge|shared> [PACKAGE...]"
       echo ""
-      echo "Sync AUR packages to pkgbuilds/ directory"
+      echo "Sync AUR packages to pkgbuilds/<tier>/ directory"
+      echo ""
+      echo "Options:"
+      echo "  --tier <tier>  Target tier: edge or shared (required)"
       echo ""
       echo "Arguments:"
       echo "  PACKAGE    One or more package names to sync (optional)"
       echo ""
       echo "Examples:"
-      echo "  $0              # Sync all packages from omarchy-aur.packages"
-      echo "  $0 yay          # Sync only the yay package"
-      echo "  $0 yay paru     # Sync yay and paru packages"
+      echo "  $0 --tier edge              # Sync all packages from edge.packages"
+      echo "  $0 --tier shared            # Sync all packages from shared.packages"
+      echo "  $0 --tier edge yay          # Sync only the yay package to edge/"
+      echo "  $0 --tier shared cursor-bin # Sync only cursor-bin to shared/"
       exit 0
       ;;
     *)
-      SPECIFIC_PACKAGES+=("$arg")
+      SPECIFIC_PACKAGES+=("$1")
+      shift
       ;;
   esac
 done
 
-print_header "AUR Package Sync"
+# Require tier
+if [[ -z "$TIER" ]]; then
+  print_error "Missing required --tier argument"
+  echo "Usage: $0 --tier <edge|shared> [PACKAGE...]"
+  exit 1
+fi
 
-mkdir -p "$PKGBUILDS_DIR"
+# Set paths based on tier
+PACKAGES_FILE="$BUILD_ROOT/build/packages/${TIER}.packages"
+TARGET_DIR="$PKGBUILDS_DIR/$TIER"
+
+print_header "AUR Package Sync (tier: $TIER)"
+
+mkdir -p "$TARGET_DIR"
 
 if [[ ! -f "$PACKAGES_FILE" ]]; then
   print_error "Package list not found: $PACKAGES_FILE"
@@ -57,14 +83,14 @@ sync_package() {
   
   if git clone "https://aur.archlinux.org/${package}.git" 2>/dev/null; then
     # Create target directory if it doesn't exist
-    mkdir -p "$PKGBUILDS_DIR/$package"
+    mkdir -p "$TARGET_DIR/$package"
     
     # Copy files (not .git directory)
-    cp -r "$package"/* "$PKGBUILDS_DIR/$package/" 2>/dev/null || true
-    cp -r "$package"/.* "$PKGBUILDS_DIR/$package/" 2>/dev/null || true
+    cp -r "$package"/* "$TARGET_DIR/$package/" 2>/dev/null || true
+    cp -r "$package"/.* "$TARGET_DIR/$package/" 2>/dev/null || true
     
     # Remove .git from destination
-    rm -rf "$PKGBUILDS_DIR/$package/.git"
+    rm -rf "$TARGET_DIR/$package/.git"
     
     SYNCED_PACKAGES+=("$package")
     ((SYNCED++))
@@ -98,9 +124,9 @@ fi
 
 # Apply patches only to packages that were actually synced
 for package in "${SYNCED_PACKAGES[@]}"; do
-  if [[ -d "$PKGBUILDS_DIR/$package/patches" ]]; then
+  if [[ -d "$TARGET_DIR/$package/patches" ]]; then
     print_info "Applying patches for $package..."
-    (cd "$PKGBUILDS_DIR/$package" && shopt -s nullglob && for patch in patches/*.patch; do 
+    (cd "$TARGET_DIR/$package" && shopt -s nullglob && for patch in patches/*.patch; do 
       if ! patch -p1 --no-backup-if-mismatch < "$patch"; then
         print_error "Failed to apply patch: $patch"
         exit 1
@@ -110,6 +136,7 @@ for package in "${SYNCED_PACKAGES[@]}"; do
 done
 
 echo ""
-print_success "Sync complete!"
+print_success "Sync complete! (tier: $TIER)"
+echo "  Target: $TARGET_DIR"
 echo "  Synced: $SYNCED"
 echo "  Failed: $FAILED"
diff --git a/build/build.sh b/build/build.sh
index 13732b0..efeee37 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
-# Simplified build script - builds all packages in /pkgbuilds/
+# Build script - builds packages based on mirror tier
+# Edge builds: /pkgbuilds/edge/* + /pkgbuilds/shared/*
+# Stable builds: /pkgbuilds/stable/* + /pkgbuilds/shared/*
 
 # Import GPG keys
 /build/import-gpg-keys.sh || exit 1
@@ -10,6 +12,13 @@ MIRROR=${MIRROR:-edge}
 BUILD_OUTPUT_DIR="/build-output/$MIRROR/$ARCH"
 FINAL_OUTPUT_DIR="/pkgs.omarchy.org/$MIRROR/$ARCH"
 
+# Determine which package directories to use based on mirror
+if [[ "$MIRROR" == "stable" ]]; then
+  PKGBUILD_DIRS="/pkgbuilds/stable /pkgbuilds/shared"
+else
+  PKGBUILD_DIRS="/pkgbuilds/edge /pkgbuilds/shared"
+fi
+
 mkdir -p "$BUILD_OUTPUT_DIR" "$FINAL_OUTPUT_DIR"
 
 # Configure Omarchy repositories for dependency resolution
@@ -57,6 +66,7 @@ sudo pacman -Sy
 echo "==> Package Builder"
 echo "==> Target architecture: $ARCH"
 echo "==> Mirror: $MIRROR"
+echo "==> Package directories: $PKGBUILD_DIRS"
 echo "==> Build workspace: $BUILD_OUTPUT_DIR"
 echo "==> Final output: $FINAL_OUTPUT_DIR"
 
@@ -64,6 +74,18 @@ FAILED_PACKAGES=""
 SUCCESSFUL_PACKAGES=""
 SKIPPED_PACKAGES=""
 
+# Find package directory - searches through PKGBUILD_DIRS
+find_package_dir() {
+  local pkg="$1"
+  for dir in $PKGBUILD_DIRS; do
+    if [[ -d "$dir/$pkg" ]]; then
+      echo "$dir/$pkg"
+      return 0
+    fi
+  done
+  return 1
+}
+
 # Get version from final output (production packages)
 get_local_version() {
   local pkg="$1"
@@ -81,12 +103,13 @@ get_local_version() {
 should_build_for_arch() {
   local pkg="$1"
   local current_arch="$ARCH"
-  local pkgbuild="/pkgbuilds/$pkg/PKGBUILD"
+  local pkgdir=$(find_package_dir "$pkg")
+  local pkgbuild="$pkgdir/PKGBUILD"
 
   [[ ! -f "$pkgbuild" ]] && return 1
 
   # Check PKGBUILD arch=() array
-  local pkgbuild_archs=$(cd "/pkgbuilds/$pkg" && bash -c 'source PKGBUILD 2>/dev/null; echo "${arch[@]}"')
+  local pkgbuild_archs=$(cd "$pkgdir" && bash -c 'source PKGBUILD 2>/dev/null; echo "${arch[@]}"')
 
   # If arch=('any'), build for all architectures
   if [[ "$pkgbuild_archs" == "any" ]]; then
@@ -101,9 +124,10 @@ should_build_for_arch() {
   fi
 }
 
-# Build a package from /pkgbuilds/
+# Build a package
 build_package() {
   local pkg="$1"
+  local pkgdir=$(find_package_dir "$pkg")
 
   echo ""
   echo "  -> Processing: $pkg"
@@ -111,14 +135,14 @@ build_package() {
   # Copy to build directory
   cd /src
   rm -rf "$pkg"
-  cp -r "/pkgbuilds/$pkg" "$pkg"
+  cp -r "$pkgdir" "$pkg"
   cd "/src/$pkg" || return 1
 
   # Get PKGBUILD version (including epoch if present)
   local pkgbuild_version=$(bash -c 'source PKGBUILD; if [[ -n "$epoch" ]]; then echo "${epoch}:${pkgver}-${pkgrel}"; else echo "${pkgver}-${pkgrel}"; fi' 2>/dev/null)
 
   if [[ -z "$pkgbuild_version" ]]; then
-    echo "    ❌ Failed to read PKGBUILD version"
+    echo "    Failed to read PKGBUILD version"
     FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
     return 1
   fi
@@ -136,7 +160,7 @@ build_package() {
     echo "    Importing package-specific PGP keys..."
     for keyfile in keys/pgp/*.asc; do
       if [[ -f "$keyfile" ]]; then
-        gpg --import "$keyfile" 2>/dev/null && echo "      ✓ Imported $(basename "$keyfile")" || echo "      ⚠ Failed to import $(basename "$keyfile")"
+        gpg --import "$keyfile" 2>/dev/null && echo "      Imported $(basename "$keyfile")" || echo "      Failed to import $(basename "$keyfile")"
       fi
     done
   fi
@@ -165,11 +189,11 @@ build_package() {
 
     cd /src/$pkg
 
-    echo "    ✓ Successfully built $pkg"
+    echo "    Successfully built $pkg"
     SUCCESSFUL_PACKAGES="$SUCCESSFUL_PACKAGES $pkg"
     return 0
   else
-    echo "    ❌ Makepkg failed for $pkg"
+    echo "    Makepkg failed for $pkg"
     echo "    DEBUG: Files in build directory:"
     ls -lah *.pkg.tar.* 2>&1 | head -20 || echo "    No package files found"
     FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
@@ -180,7 +204,8 @@ build_package() {
 # Get package dependencies from PKGBUILD
 get_package_deps() {
   local pkg="$1"
-  local pkgbuild="/pkgbuilds/$pkg/PKGBUILD"
+  local pkgdir=$(find_package_dir "$pkg")
+  local pkgbuild="$pkgdir/PKGBUILD"
 
   if [[ ! -f "$pkgbuild" ]]; then
     return
@@ -193,57 +218,23 @@ get_package_deps() {
   ) | tr ' ' '\n' | while read -r dep; do
     # Strip version constraints (e.g., 'hyprshade>=1.0' -> 'hyprshade')
     dep=$(echo "$dep" | sed 's/[<>=].*$//')
-    # Check if this dependency exists in our pkgbuilds
-    if [[ -d "/pkgbuilds/$dep" ]]; then
+    # Check if this dependency exists in our pkgbuilds (any tier)
+    if find_package_dir "$dep" >/dev/null 2>&1; then
       echo "$dep"
     fi
   done
 }
 
-# Simple dependency-aware build order
-# Build packages with no internal deps first, then those that depend on them
-build_order() {
-  local -a all_packages=()
-  local -a result=()
-  local -A package_deps_count=()
-
-  # Collect all packages
-  for pkgdir in /pkgbuilds/*/; do
-    [[ ! -d "$pkgdir" ]] && continue
-    local pkg=$(basename "$pkgdir")
-    [[ ! -f "$pkgdir/PKGBUILD" ]] && continue
-    all_packages+=("$pkg")
-
-    # Count internal dependencies
-    local dep_count=0
-    while read -r dep; do
-      ((dep_count++))
-    done < <(get_package_deps "$pkg")
-    package_deps_count[$pkg]=$dep_count
-  done
-
-  # Sort: packages with fewer deps first
-  while IFS= read -r pkg; do
-    result+=("$pkg")
-  done < <(
-    for pkg in "${all_packages[@]}"; do
-      echo "${package_deps_count[$pkg]} $pkg"
-    done | sort -n | cut -d' ' -f2-
-  )
-
-  # Output in build order
-  printf '%s\n' "${result[@]}"
-}
-
 # Check which packages need building (version check only)
 check_needs_build() {
   local pkg="$1"
-  local pkgbuild="/pkgbuilds/$pkg/PKGBUILD"
+  local pkgdir=$(find_package_dir "$pkg")
+  local pkgbuild="$pkgdir/PKGBUILD"
 
   [[ ! -f "$pkgbuild" ]] && return 1
 
   # Get PKGBUILD version (including epoch if present)
-  local pkgbuild_version=$(cd "/pkgbuilds/$pkg" && bash -c 'source PKGBUILD; if [[ -n "$epoch" ]]; then echo "${epoch}:${pkgver}-${pkgrel}"; else echo "${pkgver}-${pkgrel}"; fi' 2>/dev/null)
+  local pkgbuild_version=$(cd "$pkgdir" && bash -c 'source PKGBUILD; if [[ -n "$epoch" ]]; then echo "${epoch}:${pkgver}-${pkgrel}"; else echo "${pkgver}-${pkgrel}"; fi' 2>/dev/null)
   [[ -z "$pkgbuild_version" ]] && return 1
 
   # Check if already built
@@ -256,6 +247,20 @@ check_needs_build() {
   fi
 }
 
+# Collect all packages from the relevant directories
+collect_packages() {
+  for dir in $PKGBUILD_DIRS; do
+    if [[ -d "$dir" ]]; then
+      for pkgdir in "$dir"/*/; do
+        [[ ! -d "$pkgdir" ]] && continue
+        local pkg=$(basename "$pkgdir")
+        [[ ! -f "$pkgdir/PKGBUILD" ]] && continue
+        echo "$pkg"
+      done
+    fi
+  done
+}
+
 # Main execution
 cd /src
 
@@ -270,14 +275,15 @@ PACKAGES_TO_BUILD=()
 if [[ -n "$PACKAGES" ]]; then
   echo "==> Checking specified packages: $PACKAGES"
   for pkg_name in $PACKAGES; do
-    if [[ ! -f "/pkgbuilds/$pkg_name/PKGBUILD" ]]; then
-      echo "==> ERROR: Package '$pkg_name' not found in /pkgbuilds/"
+    pkgdir=$(find_package_dir "$pkg_name")
+    if [[ -z "$pkgdir" || ! -f "$pkgdir/PKGBUILD" ]]; then
+      echo "==> ERROR: Package '$pkg_name' not found in $PKGBUILD_DIRS"
       exit 1
     fi
 
     # Check if package should be built for this architecture
     if ! should_build_for_arch "$pkg_name"; then
-      echo "  ⊘ $pkg_name - not built for $ARCH"
+      echo "  - $pkg_name - not built for $ARCH"
       SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg_name"
       continue
     fi
@@ -285,20 +291,16 @@ if [[ -n "$PACKAGES" ]]; then
     if check_needs_build "$pkg_name"; then
       PACKAGES_TO_BUILD+=("$pkg_name")
     else
-      echo "  ✓ $pkg_name - already up to date"
+      echo "  + $pkg_name - already up to date"
       SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg_name"
     fi
   done
 else
-  # Build all packages that need updates
-  for pkgdir in /pkgbuilds/*/; do
-    [[ ! -d "$pkgdir" ]] && continue
-    pkg=$(basename "$pkgdir")
-    [[ ! -f "$pkgdir/PKGBUILD" ]] && continue
-
+  # Build all packages that need updates from the relevant directories
+  while IFS= read -r pkg; do
     # Check if package should be built for this architecture
     if ! should_build_for_arch "$pkg"; then
-      echo "  ⊘ $pkg - not built for $ARCH"
+      echo "  - $pkg - not built for $ARCH"
       SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg"
       continue
     fi
@@ -306,10 +308,10 @@ else
     if check_needs_build "$pkg"; then
       PACKAGES_TO_BUILD+=("$pkg")
     else
-      echo "  ✓ $pkg - already up to date"
+      echo "  + $pkg - already up to date"
       SKIPPED_PACKAGES="$SKIPPED_PACKAGES $pkg"
     fi
-  done
+  done < <(collect_packages)
 fi
 
 if [[ ${#PACKAGES_TO_BUILD[@]} -eq 0 ]]; then
@@ -400,9 +402,9 @@ else
 fi
 
 echo ""
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo "========================================"
 echo "==> Build Summary"
-echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+echo "========================================"
 
 # Count results
 SUCCESS_COUNT=$(echo $SUCCESSFUL_PACKAGES | wc -w)
@@ -410,9 +412,9 @@ SKIPPED_COUNT=$(echo $SKIPPED_PACKAGES | wc -w)
 FAILED_COUNT=$(echo $FAILED_PACKAGES | wc -w)
 
 echo "  Total packages: $TOTAL_COUNT"
-echo "  ✓ Built:        $SUCCESS_COUNT"
-echo "  ⏭  Skipped:      $SKIPPED_COUNT (already up-to-date)"
-echo "  ❌ Failed:       $FAILED_COUNT"
+echo "  Built:          $SUCCESS_COUNT"
+echo "  Skipped:        $SKIPPED_COUNT (already up-to-date)"
+echo "  Failed:         $FAILED_COUNT"
 
 # List failures if any
 if [[ -n "$FAILED_PACKAGES" ]]; then
diff --git a/build/packages/edge.packages b/build/packages/edge.packages
new file mode 100644
index 0000000..9663d62
--- /dev/null
+++ b/build/packages/edge.packages
@@ -0,0 +1,35 @@
+# Edge packages - sync daily, PR review required, built for edge only
+
+# Core
+elephant install
+elephant-archlinuxpkgs
+elephant-bluetooth
+elephant-calc
+elephant-clipboard
+elephant-desktopapplications
+elephant-files
+elephant-menus
+elephant-providerlist
+elephant-runner
+elephant-symbols
+elephant-todo
+elephant-unicode
+elephant-websearch
+gpu-screen-recorder
+limine-mkinitcpio-hook
+limine-snapper-sync
+macbook12-spi-driver-dkms
+pinta
+python-terminaltexteffects
+ttf-ia-writer
+typora
+tzupdate
+ufw-docker
+walker
+xdg-terminal-exec
+yaru-icon-theme
+yay
+
+# Drivers
+nvidia-580xx-utils
+lib32-nvidia-580xx-utils
diff --git a/build/packages/omarchy-aur.packages b/build/packages/omarchy-aur.packages
deleted file mode 100644
index 8bb7fbd..0000000
--- a/build/packages/omarchy-aur.packages
+++ /dev/null
@@ -1,60 +0,0 @@
-# AUR Sync List - Packages to sync from AUR with bin/aur-sync
-
-#Core Install
-1password-beta
-1password-cli
-aether
-elephant install
-elephant-archlinuxpkgs
-elephant-bluetooth
-elephant-calc
-elephant-clipboard
-elephant-desktopapplications
-elephant-files
-elephant-menus
-elephant-providerlist
-elephant-runner
-elephant-symbols
-elephant-todo
-elephant-unicode
-elephant-websearch
-gpu-screen-recorder
-hyprshade # aether dependency
-limine-mkinitcpio-hook
-limine-snapper-sync
-localsend
-localsend-bin
-macbook12-spi-driver-dkms
-omarchy-chromium-bin
-pinta
-python-terminaltexteffects
-spotify
-ttf-ia-writer
-typora
-tzupdate
-ufw-docker
-walker
-xdg-terminal-exec
-yaru-icon-theme
-yay
-
-# Extras
-visual-studio-code-bin
-cursor-bin
-cursor-cli
-claude-code
-lmstudio
-crush-bin
-bun-bin # for opencode
-github-copilot-cli
-opencode
-minecraft-launcher
-sublime-text-4
-symfony-cli
-dropbox
-dropbox-cli
-nautilus-dropbox
-openai-codex-bin
-nvidia-580xx-utils # also builds nvidia-580xx-dkms and opencl-nvidia-580xx
-lib32-nvidia-580xx-utils
-voxtype-bin
diff --git a/build/packages/shared.packages b/build/packages/shared.packages
new file mode 100644
index 0000000..8a2e0b4
--- /dev/null
+++ b/build/packages/shared.packages
@@ -0,0 +1,28 @@
+# Shared packages - sync every 6 hours, auto-merge, built for BOTH edge and stable
+# These packages mirror AUR as closely as possible
+
+1password-beta
+1password-cli
+aether
+bun-bin
+claude-code
+crush-bin
+cursor-bin
+cursor-cli
+dropbox
+dropbox-cli
+github-copilot-cli
+hyprshade
+lmstudio
+localsend
+localsend-bin
+minecraft-launcher
+nautilus-dropbox
+omarchy-chromium-bin
+openai-codex-bin
+opencode
+spotify
+sublime-text-4
+symfony-cli
+visual-studio-code-bin
+voxtype-bin
diff --git a/pkgbuilds/asdcontrol/.SRCINFO b/pkgbuilds/edge/asdcontrol/.SRCINFO
similarity index 100%
rename from pkgbuilds/asdcontrol/.SRCINFO
rename to pkgbuilds/edge/asdcontrol/.SRCINFO
diff --git a/pkgbuilds/asdcontrol/.gitignore b/pkgbuilds/edge/asdcontrol/.gitignore
similarity index 100%
rename from pkgbuilds/asdcontrol/.gitignore
rename to pkgbuilds/edge/asdcontrol/.gitignore
diff --git a/pkgbuilds/asdcontrol/PKGBUILD b/pkgbuilds/edge/asdcontrol/PKGBUILD
similarity index 100%
rename from pkgbuilds/asdcontrol/PKGBUILD
rename to pkgbuilds/edge/asdcontrol/PKGBUILD
diff --git a/pkgbuilds/asdcontrol/asdcontrol.install b/pkgbuilds/edge/asdcontrol/asdcontrol.install
similarity index 100%
rename from pkgbuilds/asdcontrol/asdcontrol.install
rename to pkgbuilds/edge/asdcontrol/asdcontrol.install
diff --git a/pkgbuilds/elephant-archlinuxpkgs/.SRCINFO b/pkgbuilds/edge/elephant-archlinuxpkgs/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-archlinuxpkgs/.SRCINFO
rename to pkgbuilds/edge/elephant-archlinuxpkgs/.SRCINFO
diff --git a/pkgbuilds/elephant-archlinuxpkgs/PKGBUILD b/pkgbuilds/edge/elephant-archlinuxpkgs/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-archlinuxpkgs/PKGBUILD
rename to pkgbuilds/edge/elephant-archlinuxpkgs/PKGBUILD
diff --git a/pkgbuilds/elephant-bluetooth/.SRCINFO b/pkgbuilds/edge/elephant-bluetooth/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-bluetooth/.SRCINFO
rename to pkgbuilds/edge/elephant-bluetooth/.SRCINFO
diff --git a/pkgbuilds/elephant-bluetooth/PKGBUILD b/pkgbuilds/edge/elephant-bluetooth/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-bluetooth/PKGBUILD
rename to pkgbuilds/edge/elephant-bluetooth/PKGBUILD
diff --git a/pkgbuilds/elephant-calc/.SRCINFO b/pkgbuilds/edge/elephant-calc/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-calc/.SRCINFO
rename to pkgbuilds/edge/elephant-calc/.SRCINFO
diff --git a/pkgbuilds/elephant-calc/PKGBUILD b/pkgbuilds/edge/elephant-calc/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-calc/PKGBUILD
rename to pkgbuilds/edge/elephant-calc/PKGBUILD
diff --git a/pkgbuilds/elephant-clipboard/.SRCINFO b/pkgbuilds/edge/elephant-clipboard/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-clipboard/.SRCINFO
rename to pkgbuilds/edge/elephant-clipboard/.SRCINFO
diff --git a/pkgbuilds/elephant-clipboard/PKGBUILD b/pkgbuilds/edge/elephant-clipboard/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-clipboard/PKGBUILD
rename to pkgbuilds/edge/elephant-clipboard/PKGBUILD
diff --git a/pkgbuilds/elephant-desktopapplications/.SRCINFO b/pkgbuilds/edge/elephant-desktopapplications/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-desktopapplications/.SRCINFO
rename to pkgbuilds/edge/elephant-desktopapplications/.SRCINFO
diff --git a/pkgbuilds/elephant-desktopapplications/PKGBUILD b/pkgbuilds/edge/elephant-desktopapplications/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-desktopapplications/PKGBUILD
rename to pkgbuilds/edge/elephant-desktopapplications/PKGBUILD
diff --git a/pkgbuilds/elephant-files/.SRCINFO b/pkgbuilds/edge/elephant-files/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-files/.SRCINFO
rename to pkgbuilds/edge/elephant-files/.SRCINFO
diff --git a/pkgbuilds/elephant-files/PKGBUILD b/pkgbuilds/edge/elephant-files/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-files/PKGBUILD
rename to pkgbuilds/edge/elephant-files/PKGBUILD
diff --git a/pkgbuilds/elephant-menus/.SRCINFO b/pkgbuilds/edge/elephant-menus/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-menus/.SRCINFO
rename to pkgbuilds/edge/elephant-menus/.SRCINFO
diff --git a/pkgbuilds/elephant-menus/PKGBUILD b/pkgbuilds/edge/elephant-menus/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-menus/PKGBUILD
rename to pkgbuilds/edge/elephant-menus/PKGBUILD
diff --git a/pkgbuilds/elephant-providerlist/.SRCINFO b/pkgbuilds/edge/elephant-providerlist/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-providerlist/.SRCINFO
rename to pkgbuilds/edge/elephant-providerlist/.SRCINFO
diff --git a/pkgbuilds/elephant-providerlist/PKGBUILD b/pkgbuilds/edge/elephant-providerlist/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-providerlist/PKGBUILD
rename to pkgbuilds/edge/elephant-providerlist/PKGBUILD
diff --git a/pkgbuilds/elephant-runner/.SRCINFO b/pkgbuilds/edge/elephant-runner/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-runner/.SRCINFO
rename to pkgbuilds/edge/elephant-runner/.SRCINFO
diff --git a/pkgbuilds/elephant-runner/PKGBUILD b/pkgbuilds/edge/elephant-runner/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-runner/PKGBUILD
rename to pkgbuilds/edge/elephant-runner/PKGBUILD
diff --git a/pkgbuilds/elephant-symbols/.SRCINFO b/pkgbuilds/edge/elephant-symbols/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-symbols/.SRCINFO
rename to pkgbuilds/edge/elephant-symbols/.SRCINFO
diff --git a/pkgbuilds/elephant-symbols/PKGBUILD b/pkgbuilds/edge/elephant-symbols/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-symbols/PKGBUILD
rename to pkgbuilds/edge/elephant-symbols/PKGBUILD
diff --git a/pkgbuilds/elephant-todo/.SRCINFO b/pkgbuilds/edge/elephant-todo/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-todo/.SRCINFO
rename to pkgbuilds/edge/elephant-todo/.SRCINFO
diff --git a/pkgbuilds/elephant-todo/PKGBUILD b/pkgbuilds/edge/elephant-todo/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-todo/PKGBUILD
rename to pkgbuilds/edge/elephant-todo/PKGBUILD
diff --git a/pkgbuilds/elephant-unicode/.SRCINFO b/pkgbuilds/edge/elephant-unicode/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-unicode/.SRCINFO
rename to pkgbuilds/edge/elephant-unicode/.SRCINFO
diff --git a/pkgbuilds/elephant-unicode/PKGBUILD b/pkgbuilds/edge/elephant-unicode/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-unicode/PKGBUILD
rename to pkgbuilds/edge/elephant-unicode/PKGBUILD
diff --git a/pkgbuilds/elephant-websearch/.SRCINFO b/pkgbuilds/edge/elephant-websearch/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant-websearch/.SRCINFO
rename to pkgbuilds/edge/elephant-websearch/.SRCINFO
diff --git a/pkgbuilds/elephant-websearch/PKGBUILD b/pkgbuilds/edge/elephant-websearch/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant-websearch/PKGBUILD
rename to pkgbuilds/edge/elephant-websearch/PKGBUILD
diff --git a/pkgbuilds/elephant/.SRCINFO b/pkgbuilds/edge/elephant/.SRCINFO
similarity index 100%
rename from pkgbuilds/elephant/.SRCINFO
rename to pkgbuilds/edge/elephant/.SRCINFO
diff --git a/pkgbuilds/elephant/.gitignore b/pkgbuilds/edge/elephant/.gitignore
similarity index 100%
rename from pkgbuilds/elephant/.gitignore
rename to pkgbuilds/edge/elephant/.gitignore
diff --git a/pkgbuilds/elephant/PKGBUILD b/pkgbuilds/edge/elephant/PKGBUILD
similarity index 100%
rename from pkgbuilds/elephant/PKGBUILD
rename to pkgbuilds/edge/elephant/PKGBUILD
diff --git a/pkgbuilds/gpu-screen-recorder/.SRCINFO b/pkgbuilds/edge/gpu-screen-recorder/.SRCINFO
similarity index 100%
rename from pkgbuilds/gpu-screen-recorder/.SRCINFO
rename to pkgbuilds/edge/gpu-screen-recorder/.SRCINFO
diff --git a/pkgbuilds/gpu-screen-recorder/PKGBUILD b/pkgbuilds/edge/gpu-screen-recorder/PKGBUILD
similarity index 100%
rename from pkgbuilds/gpu-screen-recorder/PKGBUILD
rename to pkgbuilds/edge/gpu-screen-recorder/PKGBUILD
diff --git a/pkgbuilds/gpu-screen-recorder/gpu-screen-recorder.install b/pkgbuilds/edge/gpu-screen-recorder/gpu-screen-recorder.install
similarity index 100%
rename from pkgbuilds/gpu-screen-recorder/gpu-screen-recorder.install
rename to pkgbuilds/edge/gpu-screen-recorder/gpu-screen-recorder.install
diff --git a/pkgbuilds/hyprland-preview-share-picker/PKGBUILD b/pkgbuilds/edge/hyprland-preview-share-picker/PKGBUILD
similarity index 100%
rename from pkgbuilds/hyprland-preview-share-picker/PKGBUILD
rename to pkgbuilds/edge/hyprland-preview-share-picker/PKGBUILD
diff --git a/pkgbuilds/lib32-nvidia-580xx-utils/.SRCINFO b/pkgbuilds/edge/lib32-nvidia-580xx-utils/.SRCINFO
similarity index 100%
rename from pkgbuilds/lib32-nvidia-580xx-utils/.SRCINFO
rename to pkgbuilds/edge/lib32-nvidia-580xx-utils/.SRCINFO
diff --git a/pkgbuilds/lib32-nvidia-580xx-utils/PKGBUILD b/pkgbuilds/edge/lib32-nvidia-580xx-utils/PKGBUILD
similarity index 100%
rename from pkgbuilds/lib32-nvidia-580xx-utils/PKGBUILD
rename to pkgbuilds/edge/lib32-nvidia-580xx-utils/PKGBUILD
diff --git a/pkgbuilds/limine-mkinitcpio-hook/.SRCINFO b/pkgbuilds/edge/limine-mkinitcpio-hook/.SRCINFO
similarity index 100%
rename from pkgbuilds/limine-mkinitcpio-hook/.SRCINFO
rename to pkgbuilds/edge/limine-mkinitcpio-hook/.SRCINFO
diff --git a/pkgbuilds/limine-mkinitcpio-hook/.gitignore b/pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore
similarity index 100%
rename from pkgbuilds/limine-mkinitcpio-hook/.gitignore
rename to pkgbuilds/edge/limine-mkinitcpio-hook/.gitignore
diff --git a/pkgbuilds/limine-mkinitcpio-hook/PKGBUILD b/pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD
similarity index 100%
rename from pkgbuilds/limine-mkinitcpio-hook/PKGBUILD
rename to pkgbuilds/edge/limine-mkinitcpio-hook/PKGBUILD
diff --git a/pkgbuilds/limine-snapper-sync/.SRCINFO b/pkgbuilds/edge/limine-snapper-sync/.SRCINFO
similarity index 100%
rename from pkgbuilds/limine-snapper-sync/.SRCINFO
rename to pkgbuilds/edge/limine-snapper-sync/.SRCINFO
diff --git a/pkgbuilds/limine-snapper-sync/.gitignore b/pkgbuilds/edge/limine-snapper-sync/.gitignore
similarity index 100%
rename from pkgbuilds/limine-snapper-sync/.gitignore
rename to pkgbuilds/edge/limine-snapper-sync/.gitignore
diff --git a/pkgbuilds/limine-snapper-sync/PKGBUILD b/pkgbuilds/edge/limine-snapper-sync/PKGBUILD
similarity index 100%
rename from pkgbuilds/limine-snapper-sync/PKGBUILD
rename to pkgbuilds/edge/limine-snapper-sync/PKGBUILD
diff --git a/pkgbuilds/macbook12-spi-driver-dkms/.SRCINFO b/pkgbuilds/edge/macbook12-spi-driver-dkms/.SRCINFO
similarity index 100%
rename from pkgbuilds/macbook12-spi-driver-dkms/.SRCINFO
rename to pkgbuilds/edge/macbook12-spi-driver-dkms/.SRCINFO
diff --git a/pkgbuilds/macbook12-spi-driver-dkms/.gitignore b/pkgbuilds/edge/macbook12-spi-driver-dkms/.gitignore
similarity index 100%
rename from pkgbuilds/macbook12-spi-driver-dkms/.gitignore
rename to pkgbuilds/edge/macbook12-spi-driver-dkms/.gitignore
diff --git a/pkgbuilds/macbook12-spi-driver-dkms/PKGBUILD b/pkgbuilds/edge/macbook12-spi-driver-dkms/PKGBUILD
similarity index 100%
rename from pkgbuilds/macbook12-spi-driver-dkms/PKGBUILD
rename to pkgbuilds/edge/macbook12-spi-driver-dkms/PKGBUILD
diff --git a/pkgbuilds/macbook12-spi-driver-dkms/dkms.conf b/pkgbuilds/edge/macbook12-spi-driver-dkms/dkms.conf
similarity index 100%
rename from pkgbuilds/macbook12-spi-driver-dkms/dkms.conf
rename to pkgbuilds/edge/macbook12-spi-driver-dkms/dkms.conf
diff --git a/pkgbuilds/nvidia-580xx-utils/.SRCINFO b/pkgbuilds/edge/nvidia-580xx-utils/.SRCINFO
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/.SRCINFO
rename to pkgbuilds/edge/nvidia-580xx-utils/.SRCINFO
diff --git a/pkgbuilds/nvidia-580xx-utils/0001-Enable-atomic-kernel-modesetting-by-default.patch b/pkgbuilds/edge/nvidia-580xx-utils/0001-Enable-atomic-kernel-modesetting-by-default.patch
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/0001-Enable-atomic-kernel-modesetting-by-default.patch
rename to pkgbuilds/edge/nvidia-580xx-utils/0001-Enable-atomic-kernel-modesetting-by-default.patch
diff --git a/pkgbuilds/nvidia-580xx-utils/PKGBUILD b/pkgbuilds/edge/nvidia-580xx-utils/PKGBUILD
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/PKGBUILD
rename to pkgbuilds/edge/nvidia-580xx-utils/PKGBUILD
diff --git a/pkgbuilds/nvidia-580xx-utils/limit-vram-usage b/pkgbuilds/edge/nvidia-580xx-utils/limit-vram-usage
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/limit-vram-usage
rename to pkgbuilds/edge/nvidia-580xx-utils/limit-vram-usage
diff --git a/pkgbuilds/nvidia-580xx-utils/nvidia-580xx-utils.install b/pkgbuilds/edge/nvidia-580xx-utils/nvidia-580xx-utils.install
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/nvidia-580xx-utils.install
rename to pkgbuilds/edge/nvidia-580xx-utils/nvidia-580xx-utils.install
diff --git a/pkgbuilds/nvidia-580xx-utils/nvidia-drm-outputclass.conf b/pkgbuilds/edge/nvidia-580xx-utils/nvidia-drm-outputclass.conf
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/nvidia-drm-outputclass.conf
rename to pkgbuilds/edge/nvidia-580xx-utils/nvidia-drm-outputclass.conf
diff --git a/pkgbuilds/nvidia-580xx-utils/nvidia-sleep.conf b/pkgbuilds/edge/nvidia-580xx-utils/nvidia-sleep.conf
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/nvidia-sleep.conf
rename to pkgbuilds/edge/nvidia-580xx-utils/nvidia-sleep.conf
diff --git a/pkgbuilds/nvidia-580xx-utils/nvidia-utils.sysusers b/pkgbuilds/edge/nvidia-580xx-utils/nvidia-utils.sysusers
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/nvidia-utils.sysusers
rename to pkgbuilds/edge/nvidia-580xx-utils/nvidia-utils.sysusers
diff --git a/pkgbuilds/nvidia-580xx-utils/nvidia.rules b/pkgbuilds/edge/nvidia-580xx-utils/nvidia.rules
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/nvidia.rules
rename to pkgbuilds/edge/nvidia-580xx-utils/nvidia.rules
diff --git a/pkgbuilds/nvidia-580xx-utils/systemd-homed-override.conf b/pkgbuilds/edge/nvidia-580xx-utils/systemd-homed-override.conf
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/systemd-homed-override.conf
rename to pkgbuilds/edge/nvidia-580xx-utils/systemd-homed-override.conf
diff --git a/pkgbuilds/nvidia-580xx-utils/systemd-suspend-override.conf b/pkgbuilds/edge/nvidia-580xx-utils/systemd-suspend-override.conf
similarity index 100%
rename from pkgbuilds/nvidia-580xx-utils/systemd-suspend-override.conf
rename to pkgbuilds/edge/nvidia-580xx-utils/systemd-suspend-override.conf
diff --git a/pkgbuilds/omarchy-fish/PKGBUILD b/pkgbuilds/edge/omarchy-fish/PKGBUILD
similarity index 100%
rename from pkgbuilds/omarchy-fish/PKGBUILD
rename to pkgbuilds/edge/omarchy-fish/PKGBUILD
diff --git a/pkgbuilds/omarchy-fish/omarchy-fish.install b/pkgbuilds/edge/omarchy-fish/omarchy-fish.install
similarity index 100%
rename from pkgbuilds/omarchy-fish/omarchy-fish.install
rename to pkgbuilds/edge/omarchy-fish/omarchy-fish.install
diff --git a/pkgbuilds/omarchy-keyring/.SRCINFO b/pkgbuilds/edge/omarchy-keyring/.SRCINFO
similarity index 100%
rename from pkgbuilds/omarchy-keyring/.SRCINFO
rename to pkgbuilds/edge/omarchy-keyring/.SRCINFO
diff --git a/pkgbuilds/omarchy-keyring/PKGBUILD b/pkgbuilds/edge/omarchy-keyring/PKGBUILD
similarity index 100%
rename from pkgbuilds/omarchy-keyring/PKGBUILD
rename to pkgbuilds/edge/omarchy-keyring/PKGBUILD
diff --git a/pkgbuilds/omarchy-keyring/omarchy-keyring.install b/pkgbuilds/edge/omarchy-keyring/omarchy-keyring.install
similarity index 100%
rename from pkgbuilds/omarchy-keyring/omarchy-keyring.install
rename to pkgbuilds/edge/omarchy-keyring/omarchy-keyring.install
diff --git a/pkgbuilds/omarchy-keyring/omarchy-revoked b/pkgbuilds/edge/omarchy-keyring/omarchy-revoked
similarity index 100%
rename from pkgbuilds/omarchy-keyring/omarchy-revoked
rename to pkgbuilds/edge/omarchy-keyring/omarchy-revoked
diff --git a/pkgbuilds/omarchy-keyring/omarchy-trusted b/pkgbuilds/edge/omarchy-keyring/omarchy-trusted
similarity index 100%
rename from pkgbuilds/omarchy-keyring/omarchy-trusted
rename to pkgbuilds/edge/omarchy-keyring/omarchy-trusted
diff --git a/pkgbuilds/omarchy-keyring/omarchy.gpg b/pkgbuilds/edge/omarchy-keyring/omarchy.gpg
similarity index 100%
rename from pkgbuilds/omarchy-keyring/omarchy.gpg
rename to pkgbuilds/edge/omarchy-keyring/omarchy.gpg
diff --git a/pkgbuilds/omarchy-nvim/.gitignore b/pkgbuilds/edge/omarchy-nvim/.gitignore
similarity index 100%
rename from pkgbuilds/omarchy-nvim/.gitignore
rename to pkgbuilds/edge/omarchy-nvim/.gitignore
diff --git a/pkgbuilds/omarchy-nvim/PKGBUILD b/pkgbuilds/edge/omarchy-nvim/PKGBUILD
similarity index 100%
rename from pkgbuilds/omarchy-nvim/PKGBUILD
rename to pkgbuilds/edge/omarchy-nvim/PKGBUILD
diff --git a/pkgbuilds/omarchy-nvim/lazyvim.json b/pkgbuilds/edge/omarchy-nvim/lazyvim.json
similarity index 100%
rename from pkgbuilds/omarchy-nvim/lazyvim.json
rename to pkgbuilds/edge/omarchy-nvim/lazyvim.json
diff --git a/pkgbuilds/omarchy-nvim/lua/plugins/all-themes.lua b/pkgbuilds/edge/omarchy-nvim/lua/plugins/all-themes.lua
similarity index 100%
rename from pkgbuilds/omarchy-nvim/lua/plugins/all-themes.lua
rename to pkgbuilds/edge/omarchy-nvim/lua/plugins/all-themes.lua
diff --git a/pkgbuilds/omarchy-nvim/lua/plugins/disable-news-alert.lua b/pkgbuilds/edge/omarchy-nvim/lua/plugins/disable-news-alert.lua
similarity index 100%
rename from pkgbuilds/omarchy-nvim/lua/plugins/disable-news-alert.lua
rename to pkgbuilds/edge/omarchy-nvim/lua/plugins/disable-news-alert.lua
diff --git a/pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua b/pkgbuilds/edge/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua
similarity index 100%
rename from pkgbuilds/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua
rename to pkgbuilds/edge/omarchy-nvim/lua/plugins/omarchy-theme-hotreload.lua
diff --git a/pkgbuilds/omarchy-nvim/lua/plugins/snacks-animated-scrolling-off.lua b/pkgbuilds/edge/omarchy-nvim/lua/plugins/snacks-animated-scrolling-off.lua
similarity index 100%
rename from pkgbuilds/omarchy-nvim/lua/plugins/snacks-animated-scrolling-off.lua
rename to pkgbuilds/edge/omarchy-nvim/lua/plugins/snacks-animated-scrolling-off.lua
diff --git a/pkgbuilds/omarchy-nvim/omarchy-nvim-setup b/pkgbuilds/edge/omarchy-nvim/omarchy-nvim-setup
similarity index 100%
rename from pkgbuilds/omarchy-nvim/omarchy-nvim-setup
rename to pkgbuilds/edge/omarchy-nvim/omarchy-nvim-setup
diff --git a/pkgbuilds/omarchy-nvim/plugin/after/transparency.lua b/pkgbuilds/edge/omarchy-nvim/plugin/after/transparency.lua
similarity index 100%
rename from pkgbuilds/omarchy-nvim/plugin/after/transparency.lua
rename to pkgbuilds/edge/omarchy-nvim/plugin/after/transparency.lua
diff --git a/pkgbuilds/omarchy-walker/PKGBUILD b/pkgbuilds/edge/omarchy-walker/PKGBUILD
similarity index 100%
rename from pkgbuilds/omarchy-walker/PKGBUILD
rename to pkgbuilds/edge/omarchy-walker/PKGBUILD
diff --git a/pkgbuilds/omarchy-zsh/PKGBUILD b/pkgbuilds/edge/omarchy-zsh/PKGBUILD
similarity index 100%
rename from pkgbuilds/omarchy-zsh/PKGBUILD
rename to pkgbuilds/edge/omarchy-zsh/PKGBUILD
diff --git a/pkgbuilds/omarchy-zsh/omarchy-zsh.install b/pkgbuilds/edge/omarchy-zsh/omarchy-zsh.install
similarity index 100%
rename from pkgbuilds/omarchy-zsh/omarchy-zsh.install
rename to pkgbuilds/edge/omarchy-zsh/omarchy-zsh.install
diff --git a/pkgbuilds/pinta/.SRCINFO b/pkgbuilds/edge/pinta/.SRCINFO
similarity index 100%
rename from pkgbuilds/pinta/.SRCINFO
rename to pkgbuilds/edge/pinta/.SRCINFO
diff --git a/pkgbuilds/pinta/.gitignore b/pkgbuilds/edge/pinta/.gitignore
similarity index 100%
rename from pkgbuilds/pinta/.gitignore
rename to pkgbuilds/edge/pinta/.gitignore
diff --git a/pkgbuilds/pinta/.nvchecker.toml b/pkgbuilds/edge/pinta/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/pinta/.nvchecker.toml
rename to pkgbuilds/edge/pinta/.nvchecker.toml
diff --git a/pkgbuilds/pinta/PKGBUILD b/pkgbuilds/edge/pinta/PKGBUILD
similarity index 100%
rename from pkgbuilds/pinta/PKGBUILD
rename to pkgbuilds/edge/pinta/PKGBUILD
diff --git a/pkgbuilds/python-terminaltexteffects/.SRCINFO b/pkgbuilds/edge/python-terminaltexteffects/.SRCINFO
similarity index 100%
rename from pkgbuilds/python-terminaltexteffects/.SRCINFO
rename to pkgbuilds/edge/python-terminaltexteffects/.SRCINFO
diff --git a/pkgbuilds/python-terminaltexteffects/.gitignore b/pkgbuilds/edge/python-terminaltexteffects/.gitignore
similarity index 100%
rename from pkgbuilds/python-terminaltexteffects/.gitignore
rename to pkgbuilds/edge/python-terminaltexteffects/.gitignore
diff --git a/pkgbuilds/python-terminaltexteffects/.nvchecker.toml b/pkgbuilds/edge/python-terminaltexteffects/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/python-terminaltexteffects/.nvchecker.toml
rename to pkgbuilds/edge/python-terminaltexteffects/.nvchecker.toml
diff --git a/pkgbuilds/python-terminaltexteffects/PKGBUILD b/pkgbuilds/edge/python-terminaltexteffects/PKGBUILD
similarity index 100%
rename from pkgbuilds/python-terminaltexteffects/PKGBUILD
rename to pkgbuilds/edge/python-terminaltexteffects/PKGBUILD
diff --git a/pkgbuilds/python-terminaltexteffects/fix.patch b/pkgbuilds/edge/python-terminaltexteffects/fix.patch
similarity index 100%
rename from pkgbuilds/python-terminaltexteffects/fix.patch
rename to pkgbuilds/edge/python-terminaltexteffects/fix.patch
diff --git a/pkgbuilds/signal-desktop/.SRCINFO b/pkgbuilds/edge/signal-desktop/.SRCINFO
similarity index 100%
rename from pkgbuilds/signal-desktop/.SRCINFO
rename to pkgbuilds/edge/signal-desktop/.SRCINFO
diff --git a/pkgbuilds/signal-desktop/.nvchecker.toml b/pkgbuilds/edge/signal-desktop/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/signal-desktop/.nvchecker.toml
rename to pkgbuilds/edge/signal-desktop/.nvchecker.toml
diff --git a/pkgbuilds/fcitx5/LICENSE b/pkgbuilds/edge/signal-desktop/LICENSE
similarity index 100%
rename from pkgbuilds/fcitx5/LICENSE
rename to pkgbuilds/edge/signal-desktop/LICENSE
diff --git a/pkgbuilds/fcitx5/LICENSES/0BSD.txt b/pkgbuilds/edge/signal-desktop/LICENSES/0BSD.txt
similarity index 100%
rename from pkgbuilds/fcitx5/LICENSES/0BSD.txt
rename to pkgbuilds/edge/signal-desktop/LICENSES/0BSD.txt
diff --git a/pkgbuilds/signal-desktop/PKGBUILD b/pkgbuilds/edge/signal-desktop/PKGBUILD
similarity index 100%
rename from pkgbuilds/signal-desktop/PKGBUILD
rename to pkgbuilds/edge/signal-desktop/PKGBUILD
diff --git a/pkgbuilds/signal-desktop/REUSE.toml b/pkgbuilds/edge/signal-desktop/REUSE.toml
similarity index 100%
rename from pkgbuilds/signal-desktop/REUSE.toml
rename to pkgbuilds/edge/signal-desktop/REUSE.toml
diff --git a/pkgbuilds/signal-desktop/TRADEMARK_CONSENT.txt b/pkgbuilds/edge/signal-desktop/TRADEMARK_CONSENT.txt
similarity index 100%
rename from pkgbuilds/signal-desktop/TRADEMARK_CONSENT.txt
rename to pkgbuilds/edge/signal-desktop/TRADEMARK_CONSENT.txt
diff --git a/pkgbuilds/signal-desktop/patches/aarch64.patch b/pkgbuilds/edge/signal-desktop/patches/aarch64.patch
similarity index 100%
rename from pkgbuilds/signal-desktop/patches/aarch64.patch
rename to pkgbuilds/edge/signal-desktop/patches/aarch64.patch
diff --git a/pkgbuilds/signal-desktop/signal-desktop.desktop b/pkgbuilds/edge/signal-desktop/signal-desktop.desktop
similarity index 100%
rename from pkgbuilds/signal-desktop/signal-desktop.desktop
rename to pkgbuilds/edge/signal-desktop/signal-desktop.desktop
diff --git a/pkgbuilds/tobi-try/PKGBUILD b/pkgbuilds/edge/tobi-try/PKGBUILD
similarity index 100%
rename from pkgbuilds/tobi-try/PKGBUILD
rename to pkgbuilds/edge/tobi-try/PKGBUILD
diff --git a/pkgbuilds/ttf-ia-writer/.SRCINFO b/pkgbuilds/edge/ttf-ia-writer/.SRCINFO
similarity index 100%
rename from pkgbuilds/ttf-ia-writer/.SRCINFO
rename to pkgbuilds/edge/ttf-ia-writer/.SRCINFO
diff --git a/pkgbuilds/hyprshade/.gitignore b/pkgbuilds/edge/ttf-ia-writer/.gitignore
similarity index 100%
rename from pkgbuilds/hyprshade/.gitignore
rename to pkgbuilds/edge/ttf-ia-writer/.gitignore
diff --git a/pkgbuilds/ttf-ia-writer/PKGBUILD b/pkgbuilds/edge/ttf-ia-writer/PKGBUILD
similarity index 100%
rename from pkgbuilds/ttf-ia-writer/PKGBUILD
rename to pkgbuilds/edge/ttf-ia-writer/PKGBUILD
diff --git a/pkgbuilds/typora/.SRCINFO b/pkgbuilds/edge/typora/.SRCINFO
similarity index 100%
rename from pkgbuilds/typora/.SRCINFO
rename to pkgbuilds/edge/typora/.SRCINFO
diff --git a/pkgbuilds/typora/.gitignore b/pkgbuilds/edge/typora/.gitignore
similarity index 100%
rename from pkgbuilds/typora/.gitignore
rename to pkgbuilds/edge/typora/.gitignore
diff --git a/pkgbuilds/typora/Makefile b/pkgbuilds/edge/typora/Makefile
similarity index 100%
rename from pkgbuilds/typora/Makefile
rename to pkgbuilds/edge/typora/Makefile
diff --git a/pkgbuilds/typora/PKGBUILD b/pkgbuilds/edge/typora/PKGBUILD
similarity index 100%
rename from pkgbuilds/typora/PKGBUILD
rename to pkgbuilds/edge/typora/PKGBUILD
diff --git a/pkgbuilds/typora/typora.sh b/pkgbuilds/edge/typora/typora.sh
similarity index 100%
rename from pkgbuilds/typora/typora.sh
rename to pkgbuilds/edge/typora/typora.sh
diff --git a/pkgbuilds/tzupdate/.SRCINFO b/pkgbuilds/edge/tzupdate/.SRCINFO
similarity index 100%
rename from pkgbuilds/tzupdate/.SRCINFO
rename to pkgbuilds/edge/tzupdate/.SRCINFO
diff --git a/pkgbuilds/tzupdate/PKGBUILD b/pkgbuilds/edge/tzupdate/PKGBUILD
similarity index 100%
rename from pkgbuilds/tzupdate/PKGBUILD
rename to pkgbuilds/edge/tzupdate/PKGBUILD
diff --git a/pkgbuilds/ufw-docker/.SRCINFO b/pkgbuilds/edge/ufw-docker/.SRCINFO
similarity index 100%
rename from pkgbuilds/ufw-docker/.SRCINFO
rename to pkgbuilds/edge/ufw-docker/.SRCINFO
diff --git a/pkgbuilds/ufw-docker/.gitignore b/pkgbuilds/edge/ufw-docker/.gitignore
similarity index 100%
rename from pkgbuilds/ufw-docker/.gitignore
rename to pkgbuilds/edge/ufw-docker/.gitignore
diff --git a/pkgbuilds/ufw-docker/PKGBUILD b/pkgbuilds/edge/ufw-docker/PKGBUILD
similarity index 100%
rename from pkgbuilds/ufw-docker/PKGBUILD
rename to pkgbuilds/edge/ufw-docker/PKGBUILD
diff --git a/pkgbuilds/ufw-docker/ufw-docker.install b/pkgbuilds/edge/ufw-docker/ufw-docker.install
similarity index 100%
rename from pkgbuilds/ufw-docker/ufw-docker.install
rename to pkgbuilds/edge/ufw-docker/ufw-docker.install
diff --git a/pkgbuilds/walker/.SRCINFO b/pkgbuilds/edge/walker/.SRCINFO
similarity index 100%
rename from pkgbuilds/walker/.SRCINFO
rename to pkgbuilds/edge/walker/.SRCINFO
diff --git a/pkgbuilds/walker/PKGBUILD b/pkgbuilds/edge/walker/PKGBUILD
similarity index 100%
rename from pkgbuilds/walker/PKGBUILD
rename to pkgbuilds/edge/walker/PKGBUILD
diff --git a/pkgbuilds/wayfreeze/.gitignore b/pkgbuilds/edge/wayfreeze/.gitignore
similarity index 100%
rename from pkgbuilds/wayfreeze/.gitignore
rename to pkgbuilds/edge/wayfreeze/.gitignore
diff --git a/pkgbuilds/wayfreeze/PKGBUILD b/pkgbuilds/edge/wayfreeze/PKGBUILD
similarity index 100%
rename from pkgbuilds/wayfreeze/PKGBUILD
rename to pkgbuilds/edge/wayfreeze/PKGBUILD
diff --git a/pkgbuilds/xdg-terminal-exec/.SRCINFO b/pkgbuilds/edge/xdg-terminal-exec/.SRCINFO
similarity index 100%
rename from pkgbuilds/xdg-terminal-exec/.SRCINFO
rename to pkgbuilds/edge/xdg-terminal-exec/.SRCINFO
diff --git a/pkgbuilds/xdg-terminal-exec/PKGBUILD b/pkgbuilds/edge/xdg-terminal-exec/PKGBUILD
similarity index 100%
rename from pkgbuilds/xdg-terminal-exec/PKGBUILD
rename to pkgbuilds/edge/xdg-terminal-exec/PKGBUILD
diff --git a/pkgbuilds/yaru-icon-theme/PKGBUILD b/pkgbuilds/edge/yaru-icon-theme/PKGBUILD
similarity index 100%
rename from pkgbuilds/yaru-icon-theme/PKGBUILD
rename to pkgbuilds/edge/yaru-icon-theme/PKGBUILD
diff --git a/pkgbuilds/yay/.SRCINFO b/pkgbuilds/edge/yay/.SRCINFO
similarity index 100%
rename from pkgbuilds/yay/.SRCINFO
rename to pkgbuilds/edge/yay/.SRCINFO
diff --git a/pkgbuilds/yay/.gitignore b/pkgbuilds/edge/yay/.gitignore
similarity index 100%
rename from pkgbuilds/yay/.gitignore
rename to pkgbuilds/edge/yay/.gitignore
diff --git a/pkgbuilds/yay/PKGBUILD b/pkgbuilds/edge/yay/PKGBUILD
similarity index 100%
rename from pkgbuilds/yay/PKGBUILD
rename to pkgbuilds/edge/yay/PKGBUILD
diff --git a/pkgbuilds/yay/patches/pkg-bump.patch b/pkgbuilds/edge/yay/patches/pkg-bump.patch
similarity index 100%
rename from pkgbuilds/yay/patches/pkg-bump.patch
rename to pkgbuilds/edge/yay/patches/pkg-bump.patch
diff --git a/pkgbuilds/fcitx5/.SRCINFO b/pkgbuilds/fcitx5/.SRCINFO
deleted file mode 100644
index b1019d0..0000000
--- a/pkgbuilds/fcitx5/.SRCINFO
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgbase = fcitx5
-	pkgdesc = Next generation of fcitx
-	pkgver = 5.1.16
-	pkgrel = 1
-	url = https://github.com/fcitx/fcitx5
-	arch = x86_64
-	groups = fcitx5-im
-	license = LGPL-2.1-or-later AND Unicode-DFS-2016
-	makedepends = git
-	makedepends = extra-cmake-modules
-	makedepends = ninja
-	makedepends = wayland-protocols
-	depends = cairo
-	depends = enchant
-	depends = iso-codes
-	depends = libgl
-	depends = libxkbcommon-x11
-	depends = pango
-	depends = systemd
-	depends = wayland
-	depends = xcb-imdkit
-	depends = xcb-util-wm
-	depends = libxkbfile
-	depends = gdk-pixbuf2
-	depends = json-c
-	conflicts = fcitx
-	noextract = en_dict-20121020.tar.gz
-	source = git+https://github.com/fcitx/fcitx5.git#tag=5.1.16?signed
-	source = https://download.fcitx-im.org/data/en_dict-20121020.tar.gz
-	validpgpkeys = 2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9
-	sha512sums = ca9dee1b994cf9e598b8845b96c047c4017845503dbef64b7cd014f84f6e39408b6c3c2292fec104ad10545735482563c9abc7abe4e870f4f085cf090f4a831f
-	sha512sums = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
-
-pkgname = fcitx5
diff --git a/pkgbuilds/fcitx5/.nvchecker.toml b/pkgbuilds/fcitx5/.nvchecker.toml
deleted file mode 100644
index fd915ec..0000000
--- a/pkgbuilds/fcitx5/.nvchecker.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[fcitx5]
-source = "git"
-git = "https://github.com/fcitx/fcitx5.git"
diff --git a/pkgbuilds/fcitx5/PKGBUILD b/pkgbuilds/fcitx5/PKGBUILD
deleted file mode 100644
index 441a047..0000000
--- a/pkgbuilds/fcitx5/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: Felix Yan <felixonmars@archlinux.org>
-# Contributor: csslayer <wengxt AT gmail com>
-
-pkgname=fcitx5
-pkgver=5.1.16
-_dictver=20121020
-pkgrel=1
-pkgdesc="Next generation of fcitx"
-arch=('x86_64')
-url="https://github.com/fcitx/fcitx5"
-license=('LGPL-2.1-or-later AND Unicode-DFS-2016')
-conflicts=('fcitx')
-groups=('fcitx5-im')
-depends=('cairo' 'enchant' 'iso-codes' 'libgl' 'libxkbcommon-x11' 'pango' 'systemd' 'wayland'
-         'xcb-imdkit' 'xcb-util-wm' 'libxkbfile' 'gdk-pixbuf2' 'json-c')
-makedepends=('git' 'extra-cmake-modules' 'ninja' 'wayland-protocols')
-source=("git+https://github.com/fcitx/fcitx5.git#tag=$pkgver?signed"
-        "https://download.fcitx-im.org/data/en_dict-$_dictver.tar.gz")
-noextract=("en_dict-$_dictver.tar.gz")
-sha512sums=('ca9dee1b994cf9e598b8845b96c047c4017845503dbef64b7cd014f84f6e39408b6c3c2292fec104ad10545735482563c9abc7abe4e870f4f085cf090f4a831f'
-            '8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2')
-validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9') # Weng Xuetian <wengxt@gmail.com>
-
-prepare() {
-  mv en_dict-$_dictver.tar.gz fcitx5/src/modules/spell/en_dict-$_dictver.tar.gz
-  # grep to make sure the version is correct
-  grep "SPELL_EN_DICT_VER $_dictver" fcitx5/src/modules/spell/CMakeLists.txt
-}
-
-build() {
-  cd $pkgname
-
-  cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-        -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib .
-  ninja
-}
-
-check() {
-  cd $pkgname
-  ninja test
-}
-
-package() {
-  cd $pkgname
-  DESTDIR="$pkgdir" ninja install
-  install -Dm644 LICENSES/Unicode-DFS-2016.txt -t "$pkgdir"/usr/share/licenses/$pkgname/
-}
diff --git a/pkgbuilds/fcitx5/REUSE.toml b/pkgbuilds/fcitx5/REUSE.toml
deleted file mode 100644
index 8501755..0000000
--- a/pkgbuilds/fcitx5/REUSE.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-version = 1
-
-[[annotations]]
-path = [
-    "PKGBUILD",
-    "README.md",
-    "keys/**",
-    ".SRCINFO",
-    ".nvchecker.toml",
-    "*.install",
-    "*.sysusers",
-    "*.tmpfiles",
-    "*.logrotate",
-    "*.pam",
-    "*.service",
-    "*.socket",
-    "*.timer",
-    "*.desktop",
-    "*.hook",
-]
-SPDX-FileCopyrightText = "Arch Linux contributors"
-SPDX-License-Identifier = "0BSD"
diff --git a/pkgbuilds/fcitx5/keys/pgp/2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9.asc b/pkgbuilds/fcitx5/keys/pgp/2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9.asc
deleted file mode 100644
index 34fc3f9..0000000
--- a/pkgbuilds/fcitx5/keys/pgp/2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9.asc
+++ /dev/null
@@ -1,37 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBEyUvwkBCAD0P0fGutq6L7iixhhOMCaxvTwmT84oEcNP816hNo2+YSEws8Xp
-6uv94czWDyC1ibzh++mStReE7RioieiKtH/sYrfS1M2Gwv3kGYzekx5qKx92nczt
-Ed08ufho3s3Qcw4QV0IT8JLdnqCWOTHwcPeyLJ0ZZH9fseqHfrlsbVIlFI7BnMZy
-TW4xTvgX1jJ9A5m5JWW70iaOX+Yom1k5WRUDm8RtzzK0IAkdXwYHbrVCRNumbQK5
-ZtNZr3EmBxDt3lzpzD1Ow1EStRpVgd0YVzHtv5N5o46Tp0L9j1br64zUbiOPrRss
-pVhpo0w9Mx70ay8JCBZqSBGM8GOSpsyP6g0FABEBAAG0H1dlbmcgWHVldGlhbiA8
-d2VuZ3h0QGdtYWlsLmNvbT6JATsEEwECACUCGwMGCwkIBwMCBhUIAgkKCwQWAgMB
-Ah4BAheABQJPZPw5AhkBAAoJEI6LiYy/JBL5EDIH/2H0nZqZ8sYwO1WoF6kfvxJB
-DotsuYxDOAXqQ8MzS16XFHavIyFjeYnFQHDbTHGzMLPATSmEb8HjCFgEfvHIJYjX
-57ufZI7mt9Kg79jjRFIo65JwvtFYVxUHztHQCjYCLOU8Eqnm6FKkgpjQ1xL5QLnP
-fBbetUYv5Lk2C6XJthOHEO/oACvt092pU2Qgu5eMtkMBihaCzwvp9emIHjy0aJO+
-Pw1B2x2ppfdmRYPPyxd2FjiF1JEe9E5UIEsKMpF4qLiSqNQulEOq9Dh/+Xq7Hp+D
-y9z8LxMZYMwOAImwEL9BO0PvJ5/piUhK8ityafBa0RSojIHHYqf4gt12b2aQ2bK0
-KldlbmcgWHVldGlhbiA8Y3NzbGF5ZXJAY2hha3JhLXByb2plY3Qub3JnPokBOAQT
-AQIAIgUCT2T7HwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQjouJjL8k
-EvmxVggAhbwpKqVYIOulwtVcU9Fbi3C91tDlMRDoGOhWzywhhILLqj0ynQdI9rh0
-sgEgsmd/cagY5NzROduxlgeYl8CMsG5HjTAcDqmJBgIw6Hd5wpIoR/LNXw0k5nnR
-JMn7UXtGUTqUU/dGe94Ssqeh94cYpeJ/M2yE+vsKqOS2w0fJJ+pShVY27uPiG7LS
-xPgoNBKde3PhX6uVIUU9jb4O/sYfRCHvqY6PhOymMl+ns/L8HQ0HDCgeDZc9vXGJ
-Vgxq1zt4vnff7Nvnn0NzPHjeyJJOLO4q3QCKX7rWADv9JYQ6ffcZusw9IUwgDOA6
-Gw4PYFcj57axk+89/HXyMssPnhT3YrkBDQRMlL8JAQgAvZzurDyA/sLup7IeY3Wa
-+Xyqm3oGE9IDxJtgDt85IVp+T5tp3jGk2VUWtXjchzc+XjTpsf+5r/SB0tzBxaDd
-vijmfeLtKA32pmWEqlnM3NglBOTZP97D5aCnmmiNpS9cbRVZ9gFAQlXgevB3IaDD
-esC1I2jO6+OjaZwj/4fhPaZCe1XsIM0HBotPpI5Jlv1Pj4JD8hglGZ6Fd9ws1WQ7
-u+53xOsJ6ArgpPVyv1LEXcjEn0G1xAtezX2MdZ5aZ25wxuquleT8C/aX8H7xCT/0
-BUC+ZDUZchzU/kvJ79tXbWJw96XEL9MfzPjE+vejk6JVOU570+1gNKuVHllNJJGq
-9QARAQABiQEfBBgBAgAJBQJMlL8JAhsMAAoJEI6LiYy/JBL5nXEIAIngpMxcbP/b
-BGnZgz5hbLSuOw76w7vo9xDi7aHGr74T0Kn/tecirx32RtW6DQv1ebbSOJ/8PlDl
-maCCBsVJbFN9I6zKbfSG8SFfrgHG1P/zMLUD6WLHP8nyKU6LecYoZ7HQZab3MSD4
-Ir0A405OvqlqiuLyBxNMVCDc4y/BEjf52RQKg5URlHK3bSU5Bhjv+lOTjM8Sw5la
-El1MZ4WnQ09KSy8lyVRtmKDsFS/Fozgby/3ly1wEC4mHmymDpfe3yB+8SbFPolcz
-jPpr6RDKYPy6fNYVhwdd3CT1h1QuuIdpHdHFqF16PSmHdyVPhAmqOXN2K0838LAf
-zFnVmg8Glng=
-=tbsk
------END PGP PUBLIC KEY BLOCK-----
diff --git a/pkgbuilds/1password-beta/.SRCINFO b/pkgbuilds/shared/1password-beta/.SRCINFO
similarity index 100%
rename from pkgbuilds/1password-beta/.SRCINFO
rename to pkgbuilds/shared/1password-beta/.SRCINFO
diff --git a/pkgbuilds/1password-beta/.gitlab-ci.yml b/pkgbuilds/shared/1password-beta/.gitlab-ci.yml
similarity index 100%
rename from pkgbuilds/1password-beta/.gitlab-ci.yml
rename to pkgbuilds/shared/1password-beta/.gitlab-ci.yml
diff --git a/pkgbuilds/1password-beta/1password.install b/pkgbuilds/shared/1password-beta/1password.install
similarity index 100%
rename from pkgbuilds/1password-beta/1password.install
rename to pkgbuilds/shared/1password-beta/1password.install
diff --git a/pkgbuilds/1password-beta/CODEOWNERS b/pkgbuilds/shared/1password-beta/CODEOWNERS
similarity index 100%
rename from pkgbuilds/1password-beta/CODEOWNERS
rename to pkgbuilds/shared/1password-beta/CODEOWNERS
diff --git a/pkgbuilds/1password-beta/PATCH_SUMMARY.md b/pkgbuilds/shared/1password-beta/PATCH_SUMMARY.md
similarity index 100%
rename from pkgbuilds/1password-beta/PATCH_SUMMARY.md
rename to pkgbuilds/shared/1password-beta/PATCH_SUMMARY.md
diff --git a/pkgbuilds/1password-beta/PKGBUILD b/pkgbuilds/shared/1password-beta/PKGBUILD
similarity index 100%
rename from pkgbuilds/1password-beta/PKGBUILD
rename to pkgbuilds/shared/1password-beta/PKGBUILD
diff --git a/pkgbuilds/1password-beta/aur.env b/pkgbuilds/shared/1password-beta/aur.env
similarity index 100%
rename from pkgbuilds/1password-beta/aur.env
rename to pkgbuilds/shared/1password-beta/aur.env
diff --git a/pkgbuilds/1password-beta/patches/README.md b/pkgbuilds/shared/1password-beta/patches/README.md
similarity index 100%
rename from pkgbuilds/1password-beta/patches/README.md
rename to pkgbuilds/shared/1password-beta/patches/README.md
diff --git a/pkgbuilds/1password-beta/patches/add-aarch64-support.patch.bak b/pkgbuilds/shared/1password-beta/patches/add-aarch64-support.patch.bak
similarity index 100%
rename from pkgbuilds/1password-beta/patches/add-aarch64-support.patch.bak
rename to pkgbuilds/shared/1password-beta/patches/add-aarch64-support.patch.bak
diff --git a/pkgbuilds/1password-cli/.SRCINFO b/pkgbuilds/shared/1password-cli/.SRCINFO
similarity index 100%
rename from pkgbuilds/1password-cli/.SRCINFO
rename to pkgbuilds/shared/1password-cli/.SRCINFO
diff --git a/pkgbuilds/1password-cli/.gitignore b/pkgbuilds/shared/1password-cli/.gitignore
similarity index 100%
rename from pkgbuilds/1password-cli/.gitignore
rename to pkgbuilds/shared/1password-cli/.gitignore
diff --git a/pkgbuilds/1password-cli/1password-cli.install b/pkgbuilds/shared/1password-cli/1password-cli.install
similarity index 100%
rename from pkgbuilds/1password-cli/1password-cli.install
rename to pkgbuilds/shared/1password-cli/1password-cli.install
diff --git a/pkgbuilds/1password-cli/PKGBUILD b/pkgbuilds/shared/1password-cli/PKGBUILD
similarity index 100%
rename from pkgbuilds/1password-cli/PKGBUILD
rename to pkgbuilds/shared/1password-cli/PKGBUILD
diff --git a/pkgbuilds/1password-cli/package-update.sh b/pkgbuilds/shared/1password-cli/package-update.sh
similarity index 100%
rename from pkgbuilds/1password-cli/package-update.sh
rename to pkgbuilds/shared/1password-cli/package-update.sh
diff --git a/pkgbuilds/aether/.SRCINFO b/pkgbuilds/shared/aether/.SRCINFO
similarity index 100%
rename from pkgbuilds/aether/.SRCINFO
rename to pkgbuilds/shared/aether/.SRCINFO
diff --git a/pkgbuilds/aether/PKGBUILD b/pkgbuilds/shared/aether/PKGBUILD
similarity index 100%
rename from pkgbuilds/aether/PKGBUILD
rename to pkgbuilds/shared/aether/PKGBUILD
diff --git a/pkgbuilds/bun-bin/.SRCINFO b/pkgbuilds/shared/bun-bin/.SRCINFO
similarity index 100%
rename from pkgbuilds/bun-bin/.SRCINFO
rename to pkgbuilds/shared/bun-bin/.SRCINFO
diff --git a/pkgbuilds/bun-bin/LICENSE b/pkgbuilds/shared/bun-bin/LICENSE
similarity index 100%
rename from pkgbuilds/bun-bin/LICENSE
rename to pkgbuilds/shared/bun-bin/LICENSE
diff --git a/pkgbuilds/bun-bin/PKGBUILD b/pkgbuilds/shared/bun-bin/PKGBUILD
similarity index 100%
rename from pkgbuilds/bun-bin/PKGBUILD
rename to pkgbuilds/shared/bun-bin/PKGBUILD
diff --git a/pkgbuilds/claude-code/.SRCINFO b/pkgbuilds/shared/claude-code/.SRCINFO
similarity index 100%
rename from pkgbuilds/claude-code/.SRCINFO
rename to pkgbuilds/shared/claude-code/.SRCINFO
diff --git a/pkgbuilds/claude-code/.nvchecker.toml b/pkgbuilds/shared/claude-code/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/claude-code/.nvchecker.toml
rename to pkgbuilds/shared/claude-code/.nvchecker.toml
diff --git a/pkgbuilds/claude-code/PKGBUILD b/pkgbuilds/shared/claude-code/PKGBUILD
similarity index 100%
rename from pkgbuilds/claude-code/PKGBUILD
rename to pkgbuilds/shared/claude-code/PKGBUILD
diff --git a/pkgbuilds/claude-code/update-version.sh b/pkgbuilds/shared/claude-code/update-version.sh
similarity index 100%
rename from pkgbuilds/claude-code/update-version.sh
rename to pkgbuilds/shared/claude-code/update-version.sh
diff --git a/pkgbuilds/crush-bin/.SRCINFO b/pkgbuilds/shared/crush-bin/.SRCINFO
similarity index 100%
rename from pkgbuilds/crush-bin/.SRCINFO
rename to pkgbuilds/shared/crush-bin/.SRCINFO
diff --git a/pkgbuilds/crush-bin/PKGBUILD b/pkgbuilds/shared/crush-bin/PKGBUILD
similarity index 100%
rename from pkgbuilds/crush-bin/PKGBUILD
rename to pkgbuilds/shared/crush-bin/PKGBUILD
diff --git a/pkgbuilds/cursor-bin/.SRCINFO b/pkgbuilds/shared/cursor-bin/.SRCINFO
similarity index 69%
rename from pkgbuilds/cursor-bin/.SRCINFO
rename to pkgbuilds/shared/cursor-bin/.SRCINFO
index 95f37ab..002a7c7 100644
--- a/pkgbuilds/cursor-bin/.SRCINFO
+++ b/pkgbuilds/shared/cursor-bin/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cursor-bin
 	pkgdesc = AI-first coding environment
-	pkgver = 2.3.33
+	pkgver = 2.3.34
 	pkgrel = 1
 	url = https://www.cursor.com
 	arch = x86_64
@@ -12,12 +12,12 @@ pkgbase = cursor-bin
 	depends = gcc-libs
 	depends = hicolor-icon-theme
 	depends = libxkbfile
-	noextract = cursor_2.3.33_amd64.deb
+	noextract = cursor_2.3.34_amd64.deb
 	options = !strip
-	source = https://downloads.cursor.com/production/c68681c13bdb0dea7fb85526bcc3202d20233faa/linux/x64/deb/amd64/deb/cursor_2.3.33_amd64.deb
+	source = https://downloads.cursor.com/production/643ba67cd252e2888e296dd0cf34a0c5d7625b96/linux/x64/deb/amd64/deb/cursor_2.3.34_amd64.deb
 	source = https://gitlab.archlinux.org/archlinux/packaging/packages/code/-/raw/main/code.sh
 	source = rg.sh
-	sha512sums = 8e1472e2de7356a15aca5ffd88ba5f4d2dfe982e80141ada61afa4c1897d871d34ee545eaa132b850b6a1a8a674f184306a21c11bafdf1767158aaa62c04b6ac
+	sha512sums = deec916e163ef74130fedbc2bdc128cdf4cf10e833bb75f024fca7495ebcf05b8ae81197c161b5fe6d70cb307680bef0fbfbbc744b21f77c58124aa3a084a745
 	sha512sums = 937299c6cb6be2f8d25f7dbc95cf77423875c5f8353b8bd6cd7cc8e5603cbf8405b14dbf8bd615db2e3b36ed680fc8e1909410815f7f8587b7267a699e00ab37
 	sha512sums = e79fe7659f59d1ae02fc68816399bfd31587315df6cdb6ccf1d0ca76f7cdc692c2a42b30591c0091147bd97ef14b1c7745dc26bd7cb3ea6bba45698e5044fa2a
 
diff --git a/pkgbuilds/cursor-bin/.gitignore b/pkgbuilds/shared/cursor-bin/.gitignore
similarity index 100%
rename from pkgbuilds/cursor-bin/.gitignore
rename to pkgbuilds/shared/cursor-bin/.gitignore
diff --git a/pkgbuilds/cursor-bin/PKGBUILD b/pkgbuilds/shared/cursor-bin/PKGBUILD
similarity index 89%
rename from pkgbuilds/cursor-bin/PKGBUILD
rename to pkgbuilds/shared/cursor-bin/PKGBUILD
index 520668c..01cca1f 100644
--- a/pkgbuilds/cursor-bin/PKGBUILD
+++ b/pkgbuilds/shared/cursor-bin/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gunther Schulz <dev@guntherschulz.de>
 
 pkgname=cursor-bin
-pkgver=2.3.33
+pkgver=2.3.34
 pkgrel=1
 pkgdesc='AI-first coding environment'
 arch=('x86_64')
@@ -11,13 +11,13 @@ _electron=electron37
 depends=(xdg-utils ripgrep $_electron nodejs
   'gcc-libs' 'hicolor-icon-theme' 'libxkbfile')
 options=(!strip) # Don't break ext of VSCode
-_commit=c68681c13bdb0dea7fb85526bcc3202d20233faa
+_commit=643ba67cd252e2888e296dd0cf34a0c5d7625b96
 source=("https://downloads.cursor.com/production/${_commit}/linux/x64/deb/amd64/deb/cursor_${pkgver}_amd64.deb"
 https://gitlab.archlinux.org/archlinux/packaging/packages/code/-/raw/main/code.sh rg.sh)
 sha512sums=('SKIP'
   '937299c6cb6be2f8d25f7dbc95cf77423875c5f8353b8bd6cd7cc8e5603cbf8405b14dbf8bd615db2e3b36ed680fc8e1909410815f7f8587b7267a699e00ab37'
   'e79fe7659f59d1ae02fc68816399bfd31587315df6cdb6ccf1d0ca76f7cdc692c2a42b30591c0091147bd97ef14b1c7745dc26bd7cb3ea6bba45698e5044fa2a')
-sha512sums[0]=8e1472e2de7356a15aca5ffd88ba5f4d2dfe982e80141ada61afa4c1897d871d34ee545eaa132b850b6a1a8a674f184306a21c11bafdf1767158aaa62c04b6ac
+sha512sums[0]=deec916e163ef74130fedbc2bdc128cdf4cf10e833bb75f024fca7495ebcf05b8ae81197c161b5fe6d70cb307680bef0fbfbbc744b21f77c58124aa3a084a745
 noextract=(cursor_${pkgver}_amd64.deb) # avoid double tarball
 _app=usr/share/cursor/resources/app
 package() {
diff --git a/pkgbuilds/cursor-bin/rg.sh b/pkgbuilds/shared/cursor-bin/rg.sh
similarity index 100%
rename from pkgbuilds/cursor-bin/rg.sh
rename to pkgbuilds/shared/cursor-bin/rg.sh
diff --git a/pkgbuilds/cursor-cli/.SRCINFO b/pkgbuilds/shared/cursor-cli/.SRCINFO
similarity index 100%
rename from pkgbuilds/cursor-cli/.SRCINFO
rename to pkgbuilds/shared/cursor-cli/.SRCINFO
diff --git a/pkgbuilds/cursor-cli/Cursor-TOS b/pkgbuilds/shared/cursor-cli/Cursor-TOS
similarity index 100%
rename from pkgbuilds/cursor-cli/Cursor-TOS
rename to pkgbuilds/shared/cursor-cli/Cursor-TOS
diff --git a/pkgbuilds/cursor-cli/LICENSE b/pkgbuilds/shared/cursor-cli/LICENSE
similarity index 100%
rename from pkgbuilds/cursor-cli/LICENSE
rename to pkgbuilds/shared/cursor-cli/LICENSE
diff --git a/pkgbuilds/cursor-cli/PKGBUILD b/pkgbuilds/shared/cursor-cli/PKGBUILD
similarity index 100%
rename from pkgbuilds/cursor-cli/PKGBUILD
rename to pkgbuilds/shared/cursor-cli/PKGBUILD
diff --git a/pkgbuilds/cursor-cli/cursor-cli.install b/pkgbuilds/shared/cursor-cli/cursor-cli.install
similarity index 100%
rename from pkgbuilds/cursor-cli/cursor-cli.install
rename to pkgbuilds/shared/cursor-cli/cursor-cli.install
diff --git a/pkgbuilds/cursor-cli/update-pkgver.sh b/pkgbuilds/shared/cursor-cli/update-pkgver.sh
similarity index 100%
rename from pkgbuilds/cursor-cli/update-pkgver.sh
rename to pkgbuilds/shared/cursor-cli/update-pkgver.sh
diff --git a/pkgbuilds/dropbox-cli/.SRCINFO b/pkgbuilds/shared/dropbox-cli/.SRCINFO
similarity index 100%
rename from pkgbuilds/dropbox-cli/.SRCINFO
rename to pkgbuilds/shared/dropbox-cli/.SRCINFO
diff --git a/pkgbuilds/dropbox-cli/.gitignore b/pkgbuilds/shared/dropbox-cli/.gitignore
similarity index 100%
rename from pkgbuilds/dropbox-cli/.gitignore
rename to pkgbuilds/shared/dropbox-cli/.gitignore
diff --git a/pkgbuilds/dropbox-cli/PKGBUILD b/pkgbuilds/shared/dropbox-cli/PKGBUILD
similarity index 100%
rename from pkgbuilds/dropbox-cli/PKGBUILD
rename to pkgbuilds/shared/dropbox-cli/PKGBUILD
diff --git a/pkgbuilds/dropbox-cli/dropboxd-fallback.patch b/pkgbuilds/shared/dropbox-cli/dropboxd-fallback.patch
similarity index 100%
rename from pkgbuilds/dropbox-cli/dropboxd-fallback.patch
rename to pkgbuilds/shared/dropbox-cli/dropboxd-fallback.patch
diff --git a/pkgbuilds/dropbox/.SRCINFO b/pkgbuilds/shared/dropbox/.SRCINFO
similarity index 100%
rename from pkgbuilds/dropbox/.SRCINFO
rename to pkgbuilds/shared/dropbox/.SRCINFO
diff --git a/pkgbuilds/dropbox/.nvchecker.toml b/pkgbuilds/shared/dropbox/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/dropbox/.nvchecker.toml
rename to pkgbuilds/shared/dropbox/.nvchecker.toml
diff --git a/pkgbuilds/dropbox/DropboxGlyph_Blue.svg b/pkgbuilds/shared/dropbox/DropboxGlyph_Blue.svg
similarity index 100%
rename from pkgbuilds/dropbox/DropboxGlyph_Blue.svg
rename to pkgbuilds/shared/dropbox/DropboxGlyph_Blue.svg
diff --git a/pkgbuilds/dropbox/PKGBUILD b/pkgbuilds/shared/dropbox/PKGBUILD
similarity index 100%
rename from pkgbuilds/dropbox/PKGBUILD
rename to pkgbuilds/shared/dropbox/PKGBUILD
diff --git a/pkgbuilds/dropbox/dropbox.service b/pkgbuilds/shared/dropbox/dropbox.service
similarity index 100%
rename from pkgbuilds/dropbox/dropbox.service
rename to pkgbuilds/shared/dropbox/dropbox.service
diff --git a/pkgbuilds/dropbox/dropbox@.service b/pkgbuilds/shared/dropbox/dropbox@.service
similarity index 100%
rename from pkgbuilds/dropbox/dropbox@.service
rename to pkgbuilds/shared/dropbox/dropbox@.service
diff --git a/pkgbuilds/dropbox/terms.txt b/pkgbuilds/shared/dropbox/terms.txt
similarity index 100%
rename from pkgbuilds/dropbox/terms.txt
rename to pkgbuilds/shared/dropbox/terms.txt
diff --git a/pkgbuilds/github-copilot-cli/.SRCINFO b/pkgbuilds/shared/github-copilot-cli/.SRCINFO
similarity index 100%
rename from pkgbuilds/github-copilot-cli/.SRCINFO
rename to pkgbuilds/shared/github-copilot-cli/.SRCINFO
diff --git a/pkgbuilds/github-copilot-cli/.gitignore b/pkgbuilds/shared/github-copilot-cli/.gitignore
similarity index 100%
rename from pkgbuilds/github-copilot-cli/.gitignore
rename to pkgbuilds/shared/github-copilot-cli/.gitignore
diff --git a/pkgbuilds/github-copilot-cli/.nvchecker.toml b/pkgbuilds/shared/github-copilot-cli/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/github-copilot-cli/.nvchecker.toml
rename to pkgbuilds/shared/github-copilot-cli/.nvchecker.toml
diff --git a/pkgbuilds/github-copilot-cli/PKGBUILD b/pkgbuilds/shared/github-copilot-cli/PKGBUILD
similarity index 100%
rename from pkgbuilds/github-copilot-cli/PKGBUILD
rename to pkgbuilds/shared/github-copilot-cli/PKGBUILD
diff --git a/pkgbuilds/github-copilot-cli/changelog.md b/pkgbuilds/shared/github-copilot-cli/changelog.md
similarity index 100%
rename from pkgbuilds/github-copilot-cli/changelog.md
rename to pkgbuilds/shared/github-copilot-cli/changelog.md
diff --git a/pkgbuilds/hyprshade/.SRCINFO b/pkgbuilds/shared/hyprshade/.SRCINFO
similarity index 100%
rename from pkgbuilds/hyprshade/.SRCINFO
rename to pkgbuilds/shared/hyprshade/.SRCINFO
diff --git a/pkgbuilds/ttf-ia-writer/.gitignore b/pkgbuilds/shared/hyprshade/.gitignore
similarity index 100%
rename from pkgbuilds/ttf-ia-writer/.gitignore
rename to pkgbuilds/shared/hyprshade/.gitignore
diff --git a/pkgbuilds/hyprshade/PKGBUILD b/pkgbuilds/shared/hyprshade/PKGBUILD
similarity index 100%
rename from pkgbuilds/hyprshade/PKGBUILD
rename to pkgbuilds/shared/hyprshade/PKGBUILD
diff --git a/pkgbuilds/lmstudio/.SRCINFO b/pkgbuilds/shared/lmstudio/.SRCINFO
similarity index 100%
rename from pkgbuilds/lmstudio/.SRCINFO
rename to pkgbuilds/shared/lmstudio/.SRCINFO
diff --git a/pkgbuilds/lmstudio/.nvchecker.toml b/pkgbuilds/shared/lmstudio/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/lmstudio/.nvchecker.toml
rename to pkgbuilds/shared/lmstudio/.nvchecker.toml
diff --git a/pkgbuilds/lmstudio/PKGBUILD b/pkgbuilds/shared/lmstudio/PKGBUILD
similarity index 100%
rename from pkgbuilds/lmstudio/PKGBUILD
rename to pkgbuilds/shared/lmstudio/PKGBUILD
diff --git a/pkgbuilds/localsend-bin/.SRCINFO b/pkgbuilds/shared/localsend-bin/.SRCINFO
similarity index 100%
rename from pkgbuilds/localsend-bin/.SRCINFO
rename to pkgbuilds/shared/localsend-bin/.SRCINFO
diff --git a/pkgbuilds/localsend-bin/PKGBUILD b/pkgbuilds/shared/localsend-bin/PKGBUILD
similarity index 100%
rename from pkgbuilds/localsend-bin/PKGBUILD
rename to pkgbuilds/shared/localsend-bin/PKGBUILD
diff --git a/pkgbuilds/localsend/.SRCINFO b/pkgbuilds/shared/localsend/.SRCINFO
similarity index 100%
rename from pkgbuilds/localsend/.SRCINFO
rename to pkgbuilds/shared/localsend/.SRCINFO
diff --git a/pkgbuilds/localsend/.gitignore b/pkgbuilds/shared/localsend/.gitignore
similarity index 100%
rename from pkgbuilds/localsend/.gitignore
rename to pkgbuilds/shared/localsend/.gitignore
diff --git a/pkgbuilds/localsend/PKGBUILD b/pkgbuilds/shared/localsend/PKGBUILD
similarity index 100%
rename from pkgbuilds/localsend/PKGBUILD
rename to pkgbuilds/shared/localsend/PKGBUILD
diff --git a/pkgbuilds/minecraft-launcher/.SRCINFO b/pkgbuilds/shared/minecraft-launcher/.SRCINFO
similarity index 100%
rename from pkgbuilds/minecraft-launcher/.SRCINFO
rename to pkgbuilds/shared/minecraft-launcher/.SRCINFO
diff --git a/pkgbuilds/minecraft-launcher/.gitignore b/pkgbuilds/shared/minecraft-launcher/.gitignore
similarity index 100%
rename from pkgbuilds/minecraft-launcher/.gitignore
rename to pkgbuilds/shared/minecraft-launcher/.gitignore
diff --git a/pkgbuilds/minecraft-launcher/PKGBUILD b/pkgbuilds/shared/minecraft-launcher/PKGBUILD
similarity index 100%
rename from pkgbuilds/minecraft-launcher/PKGBUILD
rename to pkgbuilds/shared/minecraft-launcher/PKGBUILD
diff --git a/pkgbuilds/minecraft-launcher/minecraft-launcher.desktop b/pkgbuilds/shared/minecraft-launcher/minecraft-launcher.desktop
similarity index 100%
rename from pkgbuilds/minecraft-launcher/minecraft-launcher.desktop
rename to pkgbuilds/shared/minecraft-launcher/minecraft-launcher.desktop
diff --git a/pkgbuilds/minecraft-launcher/minecraft-launcher.sh b/pkgbuilds/shared/minecraft-launcher/minecraft-launcher.sh
similarity index 100%
rename from pkgbuilds/minecraft-launcher/minecraft-launcher.sh
rename to pkgbuilds/shared/minecraft-launcher/minecraft-launcher.sh
diff --git a/pkgbuilds/nautilus-dropbox/.SRCINFO b/pkgbuilds/shared/nautilus-dropbox/.SRCINFO
similarity index 100%
rename from pkgbuilds/nautilus-dropbox/.SRCINFO
rename to pkgbuilds/shared/nautilus-dropbox/.SRCINFO
diff --git a/pkgbuilds/nautilus-dropbox/PKGBUILD b/pkgbuilds/shared/nautilus-dropbox/PKGBUILD
similarity index 100%
rename from pkgbuilds/nautilus-dropbox/PKGBUILD
rename to pkgbuilds/shared/nautilus-dropbox/PKGBUILD
diff --git a/pkgbuilds/omarchy-chromium-bin/.SRCINFO b/pkgbuilds/shared/omarchy-chromium-bin/.SRCINFO
similarity index 100%
rename from pkgbuilds/omarchy-chromium-bin/.SRCINFO
rename to pkgbuilds/shared/omarchy-chromium-bin/.SRCINFO
diff --git a/pkgbuilds/omarchy-chromium-bin/PKGBUILD b/pkgbuilds/shared/omarchy-chromium-bin/PKGBUILD
similarity index 100%
rename from pkgbuilds/omarchy-chromium-bin/PKGBUILD
rename to pkgbuilds/shared/omarchy-chromium-bin/PKGBUILD
diff --git a/pkgbuilds/openai-codex-bin/.SRCINFO b/pkgbuilds/shared/openai-codex-bin/.SRCINFO
similarity index 100%
rename from pkgbuilds/openai-codex-bin/.SRCINFO
rename to pkgbuilds/shared/openai-codex-bin/.SRCINFO
diff --git a/pkgbuilds/openai-codex-bin/PKGBUILD b/pkgbuilds/shared/openai-codex-bin/PKGBUILD
similarity index 100%
rename from pkgbuilds/openai-codex-bin/PKGBUILD
rename to pkgbuilds/shared/openai-codex-bin/PKGBUILD
diff --git a/pkgbuilds/opencode/.SRCINFO b/pkgbuilds/shared/opencode/.SRCINFO
similarity index 76%
rename from pkgbuilds/opencode/.SRCINFO
rename to pkgbuilds/shared/opencode/.SRCINFO
index a23dbc1..d17de1b 100644
--- a/pkgbuilds/opencode/.SRCINFO
+++ b/pkgbuilds/shared/opencode/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = opencode
 	pkgdesc = The AI coding agent built for the terminal.
-	pkgver = 1.1.11
+	pkgver = 1.1.12
 	pkgrel = 1
 	url = https://github.com/anomalyco/opencode
 	arch = aarch64
@@ -14,7 +14,7 @@ pkgbase = opencode
 	conflicts = opencode-bin
 	options = !debug
 	options = !strip
-	source = opencode-1.1.11.tar.gz::https://github.com/anomalyco/opencode/archive/v1.1.11.tar.gz
+	source = opencode-1.1.12.tar.gz::https://github.com/anomalyco/opencode/archive/v1.1.12.tar.gz
 	sha256sums = SKIP
 
 pkgname = opencode
diff --git a/pkgbuilds/opencode/PKGBUILD b/pkgbuilds/shared/opencode/PKGBUILD
similarity index 95%
rename from pkgbuilds/opencode/PKGBUILD
rename to pkgbuilds/shared/opencode/PKGBUILD
index 5d4a8ae..d61c118 100644
--- a/pkgbuilds/opencode/PKGBUILD
+++ b/pkgbuilds/shared/opencode/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: adam
 
 pkgname='opencode'
-pkgver=1.1.11
+pkgver=1.1.12
 _subver=
 options=('!debug' '!strip')
 pkgrel=1
@@ -28,7 +28,7 @@ build() {
   cd "opencode-${pkgver}"
   bun install
   cd ./packages/opencode
-  OPENCODE_CHANNEL=latest OPENCODE_VERSION=1.1.11 bun run ./script/build.ts --single
+  OPENCODE_CHANNEL=latest OPENCODE_VERSION=1.1.12 bun run ./script/build.ts --single
 }
 
 package() {
diff --git a/pkgbuilds/opencode/patches/bun-version-check.patch b/pkgbuilds/shared/opencode/patches/bun-version-check.patch
similarity index 100%
rename from pkgbuilds/opencode/patches/bun-version-check.patch
rename to pkgbuilds/shared/opencode/patches/bun-version-check.patch
diff --git a/pkgbuilds/spotify/.SRCINFO b/pkgbuilds/shared/spotify/.SRCINFO
similarity index 100%
rename from pkgbuilds/spotify/.SRCINFO
rename to pkgbuilds/shared/spotify/.SRCINFO
diff --git a/pkgbuilds/spotify/LICENSE b/pkgbuilds/shared/spotify/LICENSE
similarity index 100%
rename from pkgbuilds/spotify/LICENSE
rename to pkgbuilds/shared/spotify/LICENSE
diff --git a/pkgbuilds/spotify/PKGBUILD b/pkgbuilds/shared/spotify/PKGBUILD
similarity index 100%
rename from pkgbuilds/spotify/PKGBUILD
rename to pkgbuilds/shared/spotify/PKGBUILD
diff --git a/pkgbuilds/spotify/keys/pgp/B420FD3777CCE3A7F0076B55C85668DF69375001.asc b/pkgbuilds/shared/spotify/keys/pgp/B420FD3777CCE3A7F0076B55C85668DF69375001.asc
similarity index 100%
rename from pkgbuilds/spotify/keys/pgp/B420FD3777CCE3A7F0076B55C85668DF69375001.asc
rename to pkgbuilds/shared/spotify/keys/pgp/B420FD3777CCE3A7F0076B55C85668DF69375001.asc
diff --git a/pkgbuilds/spotify/keys/pgp/E1096BCBFF6D418796DE78515384CE82BA52C83A.asc b/pkgbuilds/shared/spotify/keys/pgp/E1096BCBFF6D418796DE78515384CE82BA52C83A.asc
similarity index 100%
rename from pkgbuilds/spotify/keys/pgp/E1096BCBFF6D418796DE78515384CE82BA52C83A.asc
rename to pkgbuilds/shared/spotify/keys/pgp/E1096BCBFF6D418796DE78515384CE82BA52C83A.asc
diff --git a/pkgbuilds/spotify/spotify.protocol b/pkgbuilds/shared/spotify/spotify.protocol
similarity index 100%
rename from pkgbuilds/spotify/spotify.protocol
rename to pkgbuilds/shared/spotify/spotify.protocol
diff --git a/pkgbuilds/spotify/spotify.sh b/pkgbuilds/shared/spotify/spotify.sh
similarity index 100%
rename from pkgbuilds/spotify/spotify.sh
rename to pkgbuilds/shared/spotify/spotify.sh
diff --git a/pkgbuilds/sublime-text-4/.SRCINFO b/pkgbuilds/shared/sublime-text-4/.SRCINFO
similarity index 100%
rename from pkgbuilds/sublime-text-4/.SRCINFO
rename to pkgbuilds/shared/sublime-text-4/.SRCINFO
diff --git a/pkgbuilds/sublime-text-4/PKGBUILD b/pkgbuilds/shared/sublime-text-4/PKGBUILD
similarity index 100%
rename from pkgbuilds/sublime-text-4/PKGBUILD
rename to pkgbuilds/shared/sublime-text-4/PKGBUILD
diff --git a/pkgbuilds/sublime-text-4/sublime-text-4.sh b/pkgbuilds/shared/sublime-text-4/sublime-text-4.sh
similarity index 100%
rename from pkgbuilds/sublime-text-4/sublime-text-4.sh
rename to pkgbuilds/shared/sublime-text-4/sublime-text-4.sh
diff --git a/pkgbuilds/symfony-cli/.SRCINFO b/pkgbuilds/shared/symfony-cli/.SRCINFO
similarity index 100%
rename from pkgbuilds/symfony-cli/.SRCINFO
rename to pkgbuilds/shared/symfony-cli/.SRCINFO
diff --git a/pkgbuilds/symfony-cli/.gitignore b/pkgbuilds/shared/symfony-cli/.gitignore
similarity index 100%
rename from pkgbuilds/symfony-cli/.gitignore
rename to pkgbuilds/shared/symfony-cli/.gitignore
diff --git a/pkgbuilds/symfony-cli/LICENSE b/pkgbuilds/shared/symfony-cli/LICENSE
similarity index 100%
rename from pkgbuilds/symfony-cli/LICENSE
rename to pkgbuilds/shared/symfony-cli/LICENSE
diff --git a/pkgbuilds/symfony-cli/PKGBUILD b/pkgbuilds/shared/symfony-cli/PKGBUILD
similarity index 100%
rename from pkgbuilds/symfony-cli/PKGBUILD
rename to pkgbuilds/shared/symfony-cli/PKGBUILD
diff --git a/pkgbuilds/symfony-cli/README.md b/pkgbuilds/shared/symfony-cli/README.md
similarity index 100%
rename from pkgbuilds/symfony-cli/README.md
rename to pkgbuilds/shared/symfony-cli/README.md
diff --git a/pkgbuilds/symfony-cli/update.sh b/pkgbuilds/shared/symfony-cli/update.sh
similarity index 100%
rename from pkgbuilds/symfony-cli/update.sh
rename to pkgbuilds/shared/symfony-cli/update.sh
diff --git a/pkgbuilds/visual-studio-code-bin/.SRCINFO b/pkgbuilds/shared/visual-studio-code-bin/.SRCINFO
similarity index 100%
rename from pkgbuilds/visual-studio-code-bin/.SRCINFO
rename to pkgbuilds/shared/visual-studio-code-bin/.SRCINFO
diff --git a/pkgbuilds/visual-studio-code-bin/.gitignore b/pkgbuilds/shared/visual-studio-code-bin/.gitignore
similarity index 100%
rename from pkgbuilds/visual-studio-code-bin/.gitignore
rename to pkgbuilds/shared/visual-studio-code-bin/.gitignore
diff --git a/pkgbuilds/visual-studio-code-bin/PKGBUILD b/pkgbuilds/shared/visual-studio-code-bin/PKGBUILD
similarity index 100%
rename from pkgbuilds/visual-studio-code-bin/PKGBUILD
rename to pkgbuilds/shared/visual-studio-code-bin/PKGBUILD
diff --git a/pkgbuilds/visual-studio-code-bin/visual-studio-code-bin.install b/pkgbuilds/shared/visual-studio-code-bin/visual-studio-code-bin.install
similarity index 100%
rename from pkgbuilds/visual-studio-code-bin/visual-studio-code-bin.install
rename to pkgbuilds/shared/visual-studio-code-bin/visual-studio-code-bin.install
diff --git a/pkgbuilds/visual-studio-code-bin/visual-studio-code-bin.sh b/pkgbuilds/shared/visual-studio-code-bin/visual-studio-code-bin.sh
similarity index 100%
rename from pkgbuilds/visual-studio-code-bin/visual-studio-code-bin.sh
rename to pkgbuilds/shared/visual-studio-code-bin/visual-studio-code-bin.sh
diff --git a/pkgbuilds/shared/voxtype-bin/.SRCINFO b/pkgbuilds/shared/voxtype-bin/.SRCINFO
new file mode 100644
index 0000000..f4fd42b
--- /dev/null
+++ b/pkgbuilds/shared/voxtype-bin/.SRCINFO
@@ -0,0 +1,45 @@
+pkgbase = voxtype-bin
+	pkgdesc = Push-to-talk voice-to-text for Linux (pre-built binaries)
+	pkgver = 0.4.11
+	pkgrel = 2
+	url = https://voxtype.io
+	install = voxtype-bin.install
+	arch = x86_64
+	license = MIT
+	depends = alsa-lib
+	depends = curl
+	depends = gcc-libs
+	depends = glibc
+	optdepends = wtype: keyboard simulation for Wayland (recommended, best CJK support)
+	optdepends = ydotool: keyboard simulation fallback (X11/TTY support)
+	optdepends = wl-clipboard: clipboard support
+	optdepends = libnotify: desktop notifications
+	optdepends = pipewire: audio server (recommended)
+	optdepends = pipewire-alsa: ALSA compatibility for PipeWire (required if using PipeWire)
+	optdepends = pulseaudio: audio server (alternative to PipeWire)
+	optdepends = vulkan-icd-loader: GPU acceleration via Vulkan (enable with: voxtype setup gpu --enable)
+	provides = voxtype
+	conflicts = voxtype
+	backup = etc/voxtype/config.toml
+	source = voxtype-0.4.11-avx2::https://github.com/peteonrails/voxtype/releases/download/v0.4.11/voxtype-0.4.11-linux-x86_64-avx2
+	source = voxtype-0.4.11-avx512::https://github.com/peteonrails/voxtype/releases/download/v0.4.11/voxtype-0.4.11-linux-x86_64-avx512
+	source = voxtype-0.4.11-vulkan::https://github.com/peteonrails/voxtype/releases/download/v0.4.11/voxtype-0.4.11-linux-x86_64-vulkan
+	source = config-0.4.11.toml::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.11/config/default.toml
+	source = voxtype-0.4.11.service::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.11/packaging/systemd/voxtype.service
+	source = voxtype-0.4.11.bash::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.11/packaging/completions/voxtype.bash
+	source = voxtype-0.4.11.zsh::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.11/packaging/completions/voxtype.zsh
+	source = voxtype-0.4.11.fish::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.11/packaging/completions/voxtype.fish
+	source = LICENSE-0.4.11::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.11/LICENSE
+	source = README-0.4.11.md::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.11/README.md
+	sha256sums = 0b15ef42486370bf7d2b6c5f71e1e9cd6b544e28afbfe10a08b3e47b700f6191
+	sha256sums = 6eb668fa56c34b643caac6b96c8c56ee39895c77edae572bf32bef9f434d15a9
+	sha256sums = 187a66c3b246c8fc3b5f2e55a28e8d9a4379cda4cbe6824aeb880b1ed3e9faf4
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+
+pkgname = voxtype-bin
diff --git a/pkgbuilds/voxtype-bin/.gitignore b/pkgbuilds/shared/voxtype-bin/.gitignore
similarity index 100%
rename from pkgbuilds/voxtype-bin/.gitignore
rename to pkgbuilds/shared/voxtype-bin/.gitignore
diff --git a/pkgbuilds/voxtype-bin/.nvchecker.toml b/pkgbuilds/shared/voxtype-bin/.nvchecker.toml
similarity index 100%
rename from pkgbuilds/voxtype-bin/.nvchecker.toml
rename to pkgbuilds/shared/voxtype-bin/.nvchecker.toml
diff --git a/pkgbuilds/voxtype-bin/PKGBUILD b/pkgbuilds/shared/voxtype-bin/PKGBUILD
similarity index 92%
rename from pkgbuilds/voxtype-bin/PKGBUILD
rename to pkgbuilds/shared/voxtype-bin/PKGBUILD
index 4135216..1d9f00f 100644
--- a/pkgbuilds/voxtype-bin/PKGBUILD
+++ b/pkgbuilds/shared/voxtype-bin/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Peter Jackson <pete@peteonrails.com>
 pkgname=voxtype-bin
-pkgver=0.4.10
-pkgrel=1
+pkgver=0.4.11
+pkgrel=2
 pkgdesc="Push-to-talk voice-to-text for Linux (pre-built binaries)"
 arch=('x86_64')
 url="https://voxtype.io"
@@ -40,9 +40,9 @@ source=(
     "README-$pkgver.md::https://raw.githubusercontent.com/peteonrails/voxtype/v$pkgver/README.md"
 )
 sha256sums=(
-    '34a32eacbe29c6c6210a876f76f083d8e7f4ac2c911bcc1e1374c3a84237fb00'  # voxtype-avx2
-    'bbe46471f6f6381e06e51644ccc16dacbca7d2a083a067d4b661a6c481007336'  # voxtype-avx512
-    'ec6e1b4eb35414e68ec65c7eaca458646c075a5f600905110ab91b77c6c87089'  # voxtype-vulkan
+    '0b15ef42486370bf7d2b6c5f71e1e9cd6b544e28afbfe10a08b3e47b700f6191'  # voxtype-avx2
+    '6eb668fa56c34b643caac6b96c8c56ee39895c77edae572bf32bef9f434d15a9'  # voxtype-avx512
+    '187a66c3b246c8fc3b5f2e55a28e8d9a4379cda4cbe6824aeb880b1ed3e9faf4'  # voxtype-vulkan
     'SKIP'  # config.toml
     'SKIP'  # voxtype.service
     'SKIP'  # voxtype.bash
diff --git a/pkgbuilds/voxtype-bin/voxtype-bin.install b/pkgbuilds/shared/voxtype-bin/voxtype-bin.install
similarity index 89%
rename from pkgbuilds/voxtype-bin/voxtype-bin.install
rename to pkgbuilds/shared/voxtype-bin/voxtype-bin.install
index 1c4747c..d8e5d28 100644
--- a/pkgbuilds/voxtype-bin/voxtype-bin.install
+++ b/pkgbuilds/shared/voxtype-bin/voxtype-bin.install
@@ -73,9 +73,10 @@ post_upgrade() {
     _detect_gpu
 
     echo ""
-    echo "    New in 0.4.1-8:"
-    echo "      - Clean binaries: no AVX-512/GFNI instruction contamination"
-    echo "      - Fixes SIGILL crashes on Zen 3 and older CPUs"
+    echo "    New in 0.4.11:"
+    echo "      - Remote Whisper server support (offload to home server or cloud)"
+    echo "      - Cancel recording mid-transcription with 'voxtype record cancel'"
+    echo "      - Output mode override: --paste and --clipboard flags"
     echo ""
 }
 
diff --git a/pkgbuilds/signal-desktop/LICENSE b/pkgbuilds/signal-desktop/LICENSE
deleted file mode 100644
index b87c5e4..0000000
--- a/pkgbuilds/signal-desktop/LICENSE
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright Arch Linux Contributors
-
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/pkgbuilds/signal-desktop/LICENSES/0BSD.txt b/pkgbuilds/signal-desktop/LICENSES/0BSD.txt
deleted file mode 120000
index ea5b606..0000000
--- a/pkgbuilds/signal-desktop/LICENSES/0BSD.txt
+++ /dev/null
@@ -1 +0,0 @@
-../LICENSE
\ No newline at end of file
diff --git a/pkgbuilds/voxtype-bin/.SRCINFO b/pkgbuilds/voxtype-bin/.SRCINFO
deleted file mode 100644
index 9f8dc7d..0000000
--- a/pkgbuilds/voxtype-bin/.SRCINFO
+++ /dev/null
@@ -1,45 +0,0 @@
-pkgbase = voxtype-bin
-	pkgdesc = Push-to-talk voice-to-text for Linux (pre-built binaries)
-	pkgver = 0.4.10
-	pkgrel = 1
-	url = https://voxtype.io
-	install = voxtype-bin.install
-	arch = x86_64
-	license = MIT
-	depends = alsa-lib
-	depends = curl
-	depends = gcc-libs
-	depends = glibc
-	optdepends = wtype: keyboard simulation for Wayland (recommended, best CJK support)
-	optdepends = ydotool: keyboard simulation fallback (X11/TTY support)
-	optdepends = wl-clipboard: clipboard support
-	optdepends = libnotify: desktop notifications
-	optdepends = pipewire: audio server (recommended)
-	optdepends = pipewire-alsa: ALSA compatibility for PipeWire (required if using PipeWire)
-	optdepends = pulseaudio: audio server (alternative to PipeWire)
-	optdepends = vulkan-icd-loader: GPU acceleration via Vulkan (enable with: voxtype setup gpu --enable)
-	provides = voxtype
-	conflicts = voxtype
-	backup = etc/voxtype/config.toml
-	source = voxtype-0.4.10-avx2::https://github.com/peteonrails/voxtype/releases/download/v0.4.10/voxtype-0.4.10-linux-x86_64-avx2
-	source = voxtype-0.4.10-avx512::https://github.com/peteonrails/voxtype/releases/download/v0.4.10/voxtype-0.4.10-linux-x86_64-avx512
-	source = voxtype-0.4.10-vulkan::https://github.com/peteonrails/voxtype/releases/download/v0.4.10/voxtype-0.4.10-linux-x86_64-vulkan
-	source = config-0.4.10.toml::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.10/config/default.toml
-	source = voxtype-0.4.10.service::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.10/packaging/systemd/voxtype.service
-	source = voxtype-0.4.10.bash::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.10/packaging/completions/voxtype.bash
-	source = voxtype-0.4.10.zsh::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.10/packaging/completions/voxtype.zsh
-	source = voxtype-0.4.10.fish::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.10/packaging/completions/voxtype.fish
-	source = LICENSE-0.4.10::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.10/LICENSE
-	source = README-0.4.10.md::https://raw.githubusercontent.com/peteonrails/voxtype/v0.4.10/README.md
-	sha256sums = 34a32eacbe29c6c6210a876f76f083d8e7f4ac2c911bcc1e1374c3a84237fb00
-	sha256sums = bbe46471f6f6381e06e51644ccc16dacbca7d2a083a067d4b661a6c481007336
-	sha256sums = ec6e1b4eb35414e68ec65c7eaca458646c075a5f600905110ab91b77c6c87089
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-
-pkgname = voxtype-bin
diff --git a/systemd/omarchy-auto-release-edge.service b/systemd/omarchy-auto-release-edge.service
index 2ca5521..48a7f5e 100644
--- a/systemd/omarchy-auto-release-edge.service
+++ b/systemd/omarchy-auto-release-edge.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Auto-release omarchy-pkgs for edge mirror
-After=network-online.target omarchy-check-upstream.service
+After=network-online.target omarchy-check-versions.service
 Wants=network-online.target
 
 [Service]
diff --git a/systemd/omarchy-auto-release-edge.timer b/systemd/omarchy-auto-release-edge.timer
index 42ae4d7..7df3a26 100644
--- a/systemd/omarchy-auto-release-edge.timer
+++ b/systemd/omarchy-auto-release-edge.timer
@@ -1,9 +1,9 @@
 [Unit]
-Description=Process omarchy-pkgs sync for edge mirror
+Description=Auto-release edge mirror every 6 hours
 
 [Timer]
-# Run 30 minutes after the upstream check
-OnCalendar=*-*-* 15:00:00 America/New_York
+# Run every 6 hours at :00 (after version check at :30)
+OnCalendar=*-*-* 01,07,13,19:00:00 America/New_York
 Persistent=true
 
 [Install]
diff --git a/systemd/omarchy-auto-release-stable.service b/systemd/omarchy-auto-release-stable.service
index f089e5a..3208b11 100644
--- a/systemd/omarchy-auto-release-stable.service
+++ b/systemd/omarchy-auto-release-stable.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Auto-release omarchy-pkgs for stable mirror
-After=network-online.target omarchy-check-upstream.service
+After=network-online.target omarchy-check-versions.service
 Wants=network-online.target
 
 [Service]
diff --git a/systemd/omarchy-auto-release-stable.timer b/systemd/omarchy-auto-release-stable.timer
index c0669f1..237726e 100644
--- a/systemd/omarchy-auto-release-stable.timer
+++ b/systemd/omarchy-auto-release-stable.timer
@@ -1,9 +1,9 @@
 [Unit]
-Description=Process omarchy-pkgs sync for stable mirror
+Description=Auto-release stable mirror every 6 hours
 
 [Timer]
-# Run 1 hour after the upstream check (after edge has completed)
-OnCalendar=*-*-* 15:00:00 America/New_York
+# Run every 6 hours at :00 (after version check at :30)
+OnCalendar=*-*-* 01,07,13,19:00:00 America/New_York
 Persistent=true
 
 [Install]
diff --git a/systemd/omarchy-check-upstream.service b/systemd/omarchy-check-upstream.service
deleted file mode 100644
index f698573..0000000
--- a/systemd/omarchy-check-upstream.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Check for upstream changes in omarchy-pkgs repository
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=oneshot
-ExecStart=/root/omarchy-pkgs/bin/check-upstream
-Environment=OMARCHY_PKGS_DIR=/root/omarchy-pkgs
-Environment=OMARCHY_STATE_DIR=/root/.state
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/omarchy-check-upstream.timer b/systemd/omarchy-check-upstream.timer
deleted file mode 100644
index 9f8b845..0000000
--- a/systemd/omarchy-check-upstream.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Daily check for upstream changes in omarchy-pkgs
-
-[Timer]
-OnCalendar=*-*-* 14:00:00 America/New_York
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff --git a/systemd/omarchy-check-versions.service b/systemd/omarchy-check-versions.service
new file mode 100644
index 0000000..dc4d228
--- /dev/null
+++ b/systemd/omarchy-check-versions.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Check PKGBUILD versions against published repo versions
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+ExecStartPre=/usr/bin/git pull --ff-only
+ExecStart=/root/omarchy-pkgs/bin/check-versions
+Environment=OMARCHY_STATE_DIR=/root/.state
+WorkingDirectory=/root/omarchy-pkgs
+
+[Install]
+WantedBy=multi-user.target
diff --git a/systemd/omarchy-check-versions.timer b/systemd/omarchy-check-versions.timer
new file mode 100644
index 0000000..0c399eb
--- /dev/null
+++ b/systemd/omarchy-check-versions.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Check package versions every 6 hours
+
+[Timer]
+# Run every 6 hours at :30 (after GitHub sync at :00)
+OnCalendar=*-*-* 00,06,12,18:30:00 America/New_York
+Persistent=true
+
+[Install]
+WantedBy=timers.target