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.
This commit is contained in:
Birk Skyum committed 2026-09-16 20:30:59 +02:00
commit 6a6e170fe4
571 files changed
+196061 -1490

No files matched your search

+5 -4
View File
@@ -10,9 +10,9 @@
# provenance only (empty when cut from a bare commit). omarchy and
# omarchy-settings must always carry identical _tag/_commit/pkgver/sha256sums.
pkgname='omarchy-settings'
_tag='v4.0.3'
_commit='0534987009061cbe2dacdde4ad564092ab698d12'
pkgver=4.0.3
_tag='v4.0.4'
_commit='c668141e9c42b13c80c9ca4ea108e11708c5e8a5'
pkgver=4.0.4
pkgrel=2
pkgdesc='Omarchy user defaults, /etc/skel content, fonts, plymouth theme, and support helpers'
# Arch-specific because the shipped /etc tree is not the same on every
@@ -75,6 +75,7 @@ backup=(
'etc/systemd/user.conf.d/20-omarchy-nofile.conf'
'etc/sddm.conf.d/10-theme.conf'
'etc/sddm.conf.d/10-wayland.conf'
'etc/udev/rules.d/60-omarchy-io-scheduler.rules'
'etc/udev/rules.d/99-omarchy-power-profile.rules'
'etc/udev/rules.d/99-omarchy-wifi-powersave.rules'
)
@@ -128,7 +129,7 @@ if [[ -n "${OMARCHY_SRC:-}" ]]; then
sha256sums=()
else
source=("omarchy::git+https://github.com/basecamp/omarchy.git#commit=${_commit}")
sha256sums=('3558399c3ddc0b9067d63c0d617d695829d8293689e9319a304839c3a6e0f9f3')
sha256sums=('8371b148aa06e9d0627c9e11668ef2dfdf54c4a9e5ffbee5aee08c3945073618')
fi
prepare() {