Commit Graph
60 Commits
Author SHA1 Message Date
ryanrhughes 9fe85272cb Track upstream branches: omarchy-dev 4.0.0.r6871.g04b374a-1, omarchy-settings-dev 4.0.0.r6871.g04b374a-1 2026-10-11 02:05:13 +00:00
ryanrhughes 1b75e24451 Track upstream branches: omarchy-dev 4.0.0.r6868.gf2a39c4-1, omarchy-settings-dev 4.0.0.r6868.gf2a39c4-1 2026-10-10 22:50:51 +00:00
ryanrhughes 51c492e708 Track upstream branches: omarchy-dev 4.0.0.r6866.g77bfaca-1, omarchy-settings-dev 4.0.0.r6866.g77bfaca-1 2026-10-10 19:28:48 +00:00
emirb c0ff0692f0 Track upstream branches: omarchy-dev 4.0.0.r6863.ga15636b-1, omarchy-settings-dev 4.0.0.r6863.ga15636b-1 2026-10-10 06:26:14 +00:00
ryanrhughes f54d045df3 Track upstream branches: omarchy-dev 4.0.0.r6860.g7cc6a55-1, omarchy-settings-dev 4.0.0.r6860.g7cc6a55-1 2026-10-10 01:53:04 +00:00
emirb cfd1b9a554 Track upstream branches: omarchy-dev 4.0.0.r6857.ge1b0e5e-1, omarchy-settings-dev 4.0.0.r6857.ge1b0e5e-1 2026-10-10 00:54:20 +00:00
Emir Beganović 011a14a0d6 Ship the USB and Thunderbolt approval watchers as user units (#922)
Omarchy enables omarchy-usb-authorization.service and
omarchy-thunderbolt-authorization.service from first-run, and the
Thunderbolt one from its setup command and a migration. The settings
packages left both only in /usr/share/omarchy/default/systemd/user, where
systemd does not look.

On edge the Thunderbolt migration (1790344599) therefore fails with "Unit
omarchy-thunderbolt-authorization.service does not exist" and every later
migration stays pending. First-run fails as well and enables none of its
units.

Install both in /usr/lib/systemd/user, wherever the source has them: the
4.0.4 release does not, so its package is unchanged.
2026-10-10 00:18:43 +00:00
emirb 7f010b273e Track upstream branches: omarchy-dev 4.0.0.r6856.g6126321-1, omarchy-settings-dev 4.0.0.r6856.g6126321-1 2026-10-09 22:51:26 +00:00
ryanrhughes 76c1de2185 Track upstream branches: claude-code 2.1.296, claude-desktop 2.31226.1, github-copilot-cli 1.0.95, mise-bin 2026.10.5, omarchy-dev 4.0.0.r6848.g2519fd9, omarchy-settings-dev 4.0.0.r6848.g2519fd9, perplexity 26.10.1+build108257, zen-browser-bin 1.23.2b 2026-10-09 22:05:49 +00:00
ryanrhughes 83778ddcb0 Track upstream branches: omarchy-dev 4.0.0.r6818.gc352b62, omarchy-settings-dev 4.0.0.r6818.gc352b62 2026-10-09 06:37:15 +00:00
ryanrhughes 2ac2319b55 Track upstream branches: omarchy-dev 4.0.0.r6815.g50d687a, omarchy-settings-dev 4.0.0.r6815.g50d687a 2026-10-08 20:02:51 +00:00
David Heinemeier Hansson a1ad25bbae Bump releases for packages with mismatched cached archives (#858) 2026-10-08 15:01:06 +02:00
ryanrhughes 963cbf1230 Track upstream branches: omarchy-dev 4.0.0.r6807.g902fd8a, omarchy-settings-dev 4.0.0.r6807.g902fd8a 2026-10-08 06:31:32 +00:00
ryanrhughes 56e0434e64 Track upstream branches: omarchy-dev 4.0.0.r6720.g8e02fc8, omarchy-settings-dev 4.0.0.r6720.g8e02fc8 2026-10-03 21:39:34 +00:00
ryanrhughes 1436a0a210 Track upstream branches: omarchy-dev 4.0.0.r6713.ga85e29a, omarchy-settings-dev 4.0.0.r6713.ga85e29a 2026-10-03 05:37:06 +00:00
Marcelo Alcantara 8e1284fff6 omarchy-settings: bump pkgrel for the hooks baseline check
The build planner only builds a recipe whose version changed, so the aarch64 builds had nothing to check. The packages' contents are unchanged.
2026-10-03 09:09:56 +10:00
Marcelo Alcantara 6711b64f8f Build settings for #13362's HOOKS baseline without a detector copy
omacom/omarchy#13362 (d0b94d98c) dropped the omarchy-hw-platform copy
omarchy-settings shipped beside its platform guard. Its 00-omarchy-hooks.conf
now asks the runtime's own detector on PATH, and keeps the busybox line where
there is none. The aarch64 settings recipes still refused any source whose
baseline names omarchy-hw-platform without that copy, so every aarch64 build
of quattro would fail once #13362 merges.

Both recipes drop that check. The copy is still installed when a source ships
the guard, as before. The test fixture follows #13362's current baseline, and
the split-layout test checks the package builds from it and ships no copy.
2026-10-03 09:04:44 +10:00
ryanrhughes 8fe3683579 Track upstream branches: omarchy-dev 4.0.0.r6694.g821ae58, omarchy-settings-dev 4.0.0.r6694.g821ae58 2026-10-02 06:01:16 +00:00
ryanrhughes 577ed75dd0 Track upstream branches: omarchy-dev 4.0.0.r6693.gf45461a, omarchy-settings-dev 4.0.0.r6693.gf45461a 2026-10-02 00:03:00 +00:00
ryanrhughes 5c4abb5146 Track upstream branches: omarchy-dev 4.0.0.r6692.gc05d901, omarchy-settings-dev 4.0.0.r6692.gc05d901 2026-10-01 13:46:24 +00:00
ryanrhughes bfad81267a Track upstream branches: omarchy-dev 4.0.0.r6691.g8b4eae6, omarchy-settings-dev 4.0.0.r6691.g8b4eae6 2026-09-29 19:34:56 +00:00
ryanrhughes c830be2720 Track upstream branches: omarchy-dev 4.0.0.r6689.gb421b1b, omarchy-settings-dev 4.0.0.r6689.gb421b1b 2026-09-29 13:14:04 +00:00
ryanrhughes af19ab222b Track upstream branches: omarchy-dev 4.0.0.r6688.ge332dc9, omarchy-settings-dev 4.0.0.r6688.ge332dc9 2026-09-28 23:27:06 +00:00
ryanrhughes f0ebc8a80b Track upstream branches: omarchy-dev 4.0.0.r6687.gb18ab49, omarchy-settings-dev 4.0.0.r6687.gb18ab49 2026-09-28 18:14:32 +00:00
Marcelo Alcantara ea7738975a omarchy-settings-dev: ship the full set on aarch64 for runtime-profile sources
#638 gave omarchy-settings this and -dev was never ported, so edge, the only
channel aarch64 machines are qualified for, still stripped zram, oomd, zswap,
the sysctl tuning and USB autosuspend there: on Snapdragon, migration
1790328426 installs zram-generator, finds no dev-zram0.swap and completes
without zram. A source with default/settings-runtime-profile now gets the same
files, backup and optdepends on aarch64 as on x86_64, Thunderbolt drop-in
included, and its HOOKS files ship as they are. Older sources, including the
current quattro pin, keep today's aarch64 package. The platform guard and its
detector check stay aarch64-only (#691, #694). The keyboard backlight unit
first-run enables ships whenever the source has it, as in omarchy-settings.

tests/settings-runtime-profile.sh now runs both recipes. pkgrel 5 so the
recipe change builds; the payload from the current pin is unchanged.
2026-09-28 21:28:47 +10:00
Marcelo Alcantara 45fb64fedb omarchy-settings-dev: check for the detector copy on aarch64 only
The guard and its detector copy now ship on aarch64 only (#691), so the check that 00-omarchy-hooks.conf has its detector failed every x86_64 build from a source that carries the HOOKS baseline. x86_64 keeps the busybox line without a detector. Same scoping as omarchy-settings in #638.
2026-09-28 13:51:12 +10:00
Marcelo Alcantara 7f77d82c0f omarchy-settings-dev: ship the platform guard on aarch64 only
No platform package is built for x86_64 and pacman refuses another architecture's package there, so x86 transactions gain nothing from the guard. The x86 HOOKS baseline keeps the busybox line without a detector, so the detector copy goes too. omarchy-settings gets the same change in #638.
2026-09-28 13:40:50 +10:00
Marcelo Alcantara 4d6b627a13 Merge remote-tracking branch 'upstream/master' into spark/aarch64-settings-boot-dropins 2026-09-28 07:54:08 +10:00
Marcelo Alcantara caac8448be omarchy-settings: pass #13362's platform-aware hooks through on aarch64
omacom/omarchy#13362 sets HOOKS per platform inside 00-omarchy-hooks.conf,
with no column-0 HOOKS= line, so the aarch64 build failed on it; settings-dev
tracks quattro automatically and would break as soon as it lands. Wrap only a
single-line HOOKS=(...), refuse any other column-0 HOOKS=, then source the
shipped files onto a Mac line and a stock line: the Mac line must come through
unchanged and the stock one must not. Back up 00-omarchy-hooks.conf when it
ships, and refuse it without the omarchy-hw-platform copy it asks.

The test now uses the real v4.0.4 hooks file, #13362's two files and
omarchy-mac-boot's 90-94 fragments, and covers upgrades over a hand-restored
file.
2026-09-28 07:53:14 +10:00
Marcelo Alcantara 919b084b93 Merge remote-tracking branch 'upstream/master' into spark/aarch64-settings-boot-dropins 2026-09-28 07:42:17 +10:00
ryanrhughes 62f3df2378 Track upstream branches: omarchy-dev 4.0.0.r6663.g3faafba, omarchy-settings-dev 4.0.0.r6663.g3faafba 2026-09-27 21:31:46 +00:00
Ryan Hughes 3de5f0af4b Pin the tracked packages to today's upstream tips
The first pins (quattro ee8ebf6, omasnap eb22bfe) date from 2026-09-21.
Edge has since published omarchy-dev from quattro 7b336b1 through a
manual rebuild, so merging the old pin would ship older code under a
higher version. Moved with the tracker's own code:
  bin/sync-upstream --lane auto-merge (BYPASS_MIN_RELEASE_AGE=1)
2026-09-27 12:41:43 -04:00
Ryan Hughes d87686ca4f Track upstream branches as pinned releases on an unattended lane
Since publishing moved to CI on merge, a package whose PKGBUILD never
changes while its source moves was never rebuilt: omarchy-dev and
omarchy-settings-dev followed quattro through "#branch=" and a pkgver()
function, and nothing in this repository changed when quattro did. The
host timers that used to notice are off, so edge fell days behind.

The rule now: no git source without a commit or tag pin
(tests/pinned-sources.sh, run in CI). A package that has to follow a
branch declares a git_branch upstream watch, and the pin moves through
the same PR/build/publish path as every other version bump.

Watch (helpers/upstream-watch.py)
  git_branch gains tag_pattern: the newest release tag in the pinned
  commit's own history, exposed as {tag}/{version}/{distance}, so a
  branch build is versioned <tag>.r<n>.g<sha>, above the release it
  follows and below the next one. One blobless clone per branch per
  run, shared by every package on it. min_release_age selects the
  newest commit older than the window, so a push burst builds once.

Lane (helpers/package-metadata.sh, bin/sync-upstream --lane)
  "auto_merge": true moves a package from the reviewed 6-hourly sync
  PR to the unattended lane. Packages pinned from the same branch move
  together: a failure on one restores the others and fails the group,
  so the dev pair can never ship from two quattro commits.

Tracker (.github/workflows/track-branches.yml)
  Every two hours: pin, open one PR with a GitHub App token, enable
  auto-merge. Branch protection still gates the merge on result,
  self-tests and build-isolation. A tip that fails to build stays an
  open red PR until the next tick supersedes it. The App is required:
  a PR opened with GITHUB_TOKEN has its checks held for approval and
  its auto-merge would not fire publish.yml.

The reviewed workflows (sync-upstream, sync-rebuilds) open their PRs
with the same App so their builds start without a maintainer clicking
"Approve workflows to run"; without the App they fall back to
GITHUB_TOKEN and behave as before.

Recipes
  The dev pair pins _commit and a real sha256sum, keeps the OMARCHY_SRC
  override, and drops pkgver(). Its r-number stays the branch's total
  commit count because the published history used it and pacman must
  never see the version go down. omasnap-git is new: omacom/omasnap
  main, versioned <tag>.r<distance>.g<sha>, provides/conflicts omasnap.
2026-09-27 12:39:53 -04:00
Jim Martin 21f3c4a8c4 omarchy-settings: keep the Mac initramfs hooks on aarch64
Apple Silicon Macs install the aarch64 package too, and an unconditional
HOOKS= line would replace their asahi hooks. Apply Omarchy's HOOKS line only
when the incoming hooks lack asahi, in whichever drop-in carries it, and
rebuild omarchy-settings (4.0.4-3) so existing installs get the fix.
2026-09-27 09:08:49 -05:00
Jim Martin 9d05b3fb06 Merge remote-tracking branch 'upstream/master' into spark/aarch64-settings-boot-dropins 2026-09-26 17:38:24 -05:00
Marcelo Alcantara e841c87036 omarchy-settings-dev: rebuild so the dev pair shares one quattro commit 2026-09-26 11:18:24 +10:00
Marcelo Alcantara fb2ade61fc Give the platform guard its own detector copy instead of moving it
Moving omarchy-hw-platform from omarchy to omarchy-settings loses the file
when the dev pair installs in separate transactions, since omarchy-dev does
not pin omarchy-settings-dev's version. Settings now installs a copy beside
the guard script and omarchy keeps its detector, so no file changes owner.
2026-09-25 20:01:13 +10:00
Marcelo Alcantara 0a65168b09 Move the platform detector to omarchy-settings with the guard
The settings package's platform guard runs omarchy-hw-platform before the
omarchy runtime is installed. omarchy leaves the detector out of its bin/
loop and settings ships it, with the /usr/share/omarchy/bin link the Apple
predicate and the CLI router use, whenever the source has it.
2026-09-25 19:56:22 +10:00
Marcelo Alcantara 00fac82ad3 omarchy-settings: ship the pacman platform guard when the source has it
The guard hook and the script it runs install together from omarchy-settings,
so they are resident before the runtime and hardware packages. Conditional, so
builds from sources without them are unchanged.
2026-09-25 19:23:36 +10:00
Birk Skyum 39722554db Refresh dev settings version and package revision
Record the current quattro-derived version before bumping pkgrel, so makepkg does not discard the revision bump when updating a stale pkgver.
2026-09-16 20:37:43 +02:00
Birk Skyum 6a6e170fe4 Merge current master into ARM settings boot fix
Preserve the v4.0.4 source pin and checksum while retaining the settings package revision bump. Keep Jim Martin’s boot-configuration fix and original commit intact.
2026-09-16 20:30:59 +02:00
David Heinemeier HanssonandClaude Fable 5.1 28da766fba Protect the kyber I/O scheduler udev rule on upgrade (#425)
basecamp/omarchy#11653 added etc/udev/rules.d/60-omarchy-io-scheduler.rules. package() already ships the whole etc/ tree, so the rule lands on new installs with the next build; list it in backup= so pacman keeps a user's local edit of the rule across upgrades, like the other package-owned /etc drop-ins.


Claude-Session: https://claude.ai/code/session_01EqYNBv5cERVom2zox5epyE

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-13 17:58:22 +02:00
Jim Martin ccecdbde56 omarchy-settings: keep the Limine and mkinitcpio drop-ins on aarch64
The aarch64 packages removed etc/mkinitcpio.conf.d and
etc/limine-entry-tool.d wholesale. On an encrypted aarch64 install that boots
with Limine (DGX Spark, Snapdragon X), installing the published package
therefore drops omarchy_hooks.conf, HOOKS falls back to /etc/mkinitcpio.conf,
and the next kernel update builds an initramfs with no encrypt hook: the
machine hangs waiting for /dev/mapper/root with no prompt.

Ship both drop-in directories on aarch64 and remove only
thunderbolt_module.conf, whose module ARM kernels do not have. Keep the
Limine template and the snapper notifier autostart for the same reason. The
memory-stack removals (zram, oomd, zswap, USB autosuspend) are unchanged.
2026-09-09 22:36:53 -05:00
Ryan Hughes 397cf6f527 Package the locate service options 2026-09-06 21:46:40 -04:00
Marcelo Alcantara 4ed5f14629 Build the omarchy package pair for aarch64
The Omarchy payload is architecture-independent, but the package is not.
On x86_64 omarchy pulls the Limine + mkinitcpio hook + Snapper boot stack;
on Apple Silicon the system boots through m1n1 + GRUB from the Asahi
packages on Arch Linux ARM's kernel, so that stack does not apply, and
Wi-Fi on the Broadcom parts needs the iwd backend. The shipped /etc tree
differs too: mkinitcpio reads every file under /etc/mkinitcpio.conf.d/,
so shipping omarchy_hooks.conf on aarch64 injects the Limine hooks into
the Asahi kernel's initramfs, and the zram/zswap/oomd drop-ins and the
zram-tuned vm.* sysctls belong to the x86_64 memory stack.

makepkg only honours depends_<arch> and optdepends_<arch> on
arch-specific packages, so arch=('any') becomes ('x86_64' 'aarch64').
backup=() has no arch-suffixed form, so the x86_64-only entries are
appended under CARCH and each of those paths is removed from the aarch64
package in package(). The x86_64 package keeps exactly the contents it
had; only its filename suffix changes.

The install scriptlet applies the hardened cups-files.conf on every
platform, then on Apple Silicon keeps the Arch Linux ARM system identity
(/etc/os-release stays the distribution's symlink) instead of the
etc-overrides. The -dev pair carries the same change so the pairs stay in
lockstep.
2026-09-02 21:59:45 +10:00
Ryan Hughes 6daa7c90e4 Stage CUPS authorization as settings override (#237) 2026-08-29 02:19:29 -04:00
Ryan Hughes 26bde8fae3 Add channels metadata: membership and build-channel rules for edge/rc/stable
A package's .omarchy/package.json may now pin where it lives with
"channels": [...]. With the key present the package builds in each listed
channel except stable (stable is only fed by promotion); without it, today's
defaults hold (build for edge; fast-ring also builds stable directly).

package_moves_to_channel() is the advance/promote eligibility rule: a member
of the destination channel that is not built there natively.

The release pair (omarchy, omarchy-settings) is edge+rc+stable — edge stays
during the client-migration overlap window and drops later. The dev pair is
pinned to edge only.
2026-08-27 01:10:33 -04:00
David Heinemeier Hansson bbe7beeb2d Install the omarchy-crash-watch user unit
Ships with the crash notifier added in basecamp/omarchy, which offers an AI
diagnosis when a process dumps core.
2026-08-12 13:54:18 +02:00
David Heinemeier HanssonandClaude Fable 5 eb0cce3d5c Ship systemd-oomd app.slice policy in omarchy-settings-dev
Installs the upstream app.slice oomd drop-in so memory pressure kills an
app scope instead of the compositor session, and protects user edits to
etc/systemd/oomd.conf.d/10-omarchy.conf on upgrade.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-31 22:03:55 -05:00
David Heinemeier HanssonandClaude Opus 5 6d4502f3d7 Own the zram-generator config in omarchy-settings
The settings package now ships /etc/systemd/zram-generator.conf, so it needs
a backup entry to protect user edits across upgrades like every other file it
places in /etc, and an optdepends line pointing at the package that reads it.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-07-27 10:54:35 -07:00