Skip to content

Guard three x86-only assumptions so Omarchy can install on aarch64 #8039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oceanapplications wants to merge 2 commits into
base: quattro
Choose a base branch
from
Open

Guard three x86-only assumptions so Omarchy can install on aarch64 #8039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6239e88
Guard three x86-only assumptions so Omarchy can install on aarch64
oceanapplications Aug 24, 2026
57b3b91
Derive an aarch64 pacman.conf instead of skipping the restore
oceanapplications Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion etc/mkinitcpio.conf.d/thunderbolt_module.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
MODULES+=(thunderbolt)
# Thunderbolt is x86-oriented hardware and the module is not built for every
# architecture -- ALARM's aarch64 kernel has no `thunderbolt`. mkinitcpio treats
# an unresolvable MODULES entry as an error, which fails every initramfs build
# on such a system, so gate it rather than forcing it unconditionally.
if [[ $(uname -m) == x86_64 ]]; then
MODULES+=(thunderbolt)
fi
28 changes: 26 additions & 2 deletions install/post-install/pacman.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
# Configure pacman after package installation completes. Offline target package
# installs use the live ISO's offline pacman.conf until this final restore.
cp -f "$OMARCHY_PATH/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf" /etc/pacman.conf
cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable}" /etc/pacman.d/mirrorlist
case "$(uname -m)" in
aarch64)
# Omarchy's pacman.conf and mirrorlist describe an x86_64 Arch system:
# [multilib] is 32-bit x86 libraries and no ARM mirror carries it, and the
# mirrorlist points at Omarchy's mirror of Arch, which is x86_64 only.
# Arch Linux ARM also lays its tree out as $arch/$repo rather than Arch's
# $repo/os/$arch, so the mirrorlist cannot be reused with a different host.
#
# Derive the config from Omarchy's instead: drop [multilib], keep [omarchy]
# (its $arch placeholder resolves correctly), add Arch Linux ARM's own
# [alarm] and [aur] repositories, and leave the mirrorlist the distribution
# installed. Skipping this step is not an option: the live ISO's pacman.conf
# only knows the offline mirror, which does not exist on the installed system.
awk '
/^\[multilib\]$/ { skip = 1; next }
/^\[/ { skip = 0 }
skip { next }
{ print }
' "$OMARCHY_PATH/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf" >/etc/pacman.conf
printf '\n[alarm]\nInclude = /etc/pacman.d/mirrorlist\n\n[aur]\nInclude = /etc/pacman.d/mirrorlist\n' >>/etc/pacman.conf
;;
*)
cp -f "$OMARCHY_PATH/default/pacman/pacman-${OMARCHY_MIRROR:-stable}.conf" /etc/pacman.conf
cp -f "$OMARCHY_PATH/default/pacman/mirrorlist-${OMARCHY_MIRROR:-stable}" /etc/pacman.d/mirrorlist
;;
esac

# omarchy-settings skips this override until cups-browsed is actually present
# to avoid pacman creating cups-browsed.conf.pacnew during ISO package install.
Expand Down
9 changes: 7 additions & 2 deletions install/user/mise-work.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ case ${OMARCHY_SETUP_CONTEXT:-runtime} in
esac

if [[ -n $NODE_PACKAGE_DIR ]]; then
NODE_TARBALL=$(find "$NODE_PACKAGE_DIR" -name "node-v*-linux-x64.tar.gz" -type f 2>/dev/null | head -n1)
# Node names its builds x64/arm64, not by uname
case "$(uname -m)" in
aarch64) _NODE_ARCH=arm64 ;;
*) _NODE_ARCH=x64 ;;
esac
NODE_TARBALL=$(find "$NODE_PACKAGE_DIR" -name "node-v*-linux-${_NODE_ARCH}.tar.gz" -type f 2>/dev/null | head -n1)
if [[ -z $NODE_TARBALL ]]; then
if [[ ${OMARCHY_SETUP_CONTEXT:-} == "provision-owner" ]]; then
# A factory snapshot predating the bundled tarball may not have it staged.
Expand All @@ -31,7 +36,7 @@ if [[ -n $NODE_PACKAGE_DIR ]]; then
exit 1
fi
else
NODE_VERSION=$(basename "$NODE_TARBALL" | sed 's/node-v\(.*\)-linux-x64.tar.gz/\1/')
NODE_VERSION=$(basename "$NODE_TARBALL" | sed "s/node-v\\(.*\\)-linux-${_NODE_ARCH}.tar.gz/\\1/")
NODE_INSTALL_DIR="$HOME/.local/share/mise/installs/node/$NODE_VERSION"

mkdir -p "$NODE_INSTALL_DIR"
Expand Down