From 4af82f7149399cebe9400fd9d119dbda616ee6a0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 15 Aug 2025 09:50:22 +0200 Subject: [PATCH 01/27] Turn off tte until the package is fixed --- install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 107df08ac7..5bea566f09 100755 --- a/install.sh +++ b/install.sh @@ -17,12 +17,13 @@ trap catch_errors ERR show_logo() { clear - tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand} + # tte -i ~/.local/share/omarchy/logo.txt --frame-rate ${2:-120} ${1:-expand} + cat <~/.local/share/omarchy/logo.txt echo } show_subtext() { - echo "$1" | tte --frame-rate ${3:-640} ${2:-wipe} + echo "$1" # | tte --frame-rate ${3:-640} ${2:-wipe} echo } From 73b6afb3855ed8d8ae3437a33e2fe3c8a524634d Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Thu, 14 Aug 2025 17:26:20 +0200 Subject: [PATCH 02/27] add guard for arm architecture --- install/preflight/guard.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/install/preflight/guard.sh b/install/preflight/guard.sh index 9d90c2280b..41cac6e619 100644 --- a/install/preflight/guard.sh +++ b/install/preflight/guard.sh @@ -17,8 +17,13 @@ done # Must not be running as root [ "$EUID" -eq 0 ] && abort "Running as user (not root)" -# Must be x86 only to fully work -[ "$(uname -m)" != "x86_64" ] && abort "x86_64 CPU" +# Must be x86 only to fully work, or ARM if OMARCHY_ARM is set +if [ -z "$OMARCHY_ARM" ]; then + [ "$(uname -m)" != "x86_64" ] && abort "x86_64 CPU" +else + arch=$(uname -m) + [[ "$arch" != "aarch64" && "$arch" != "arm64" ]] && abort "ARM CPU" +fi # Must not have Gnome or KDE already install pacman -Qe gnome-shell &>/dev/null && abort "Fresh + Vanilla Arch" From fc73a8e84eac70e8266bb30e663b1a101d8b73ad Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Thu, 14 Aug 2025 17:50:15 +0200 Subject: [PATCH 03/27] change omarchy repo --- boot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.sh b/boot.sh index 9005487a59..564787f9b2 100755 --- a/boot.sh +++ b/boot.sh @@ -17,7 +17,7 @@ echo -e "\n$ansi_art\n" sudo pacman -Sy --noconfirm --needed git # Use custom repo if specified, otherwise default to basecamp/omarchy -OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}" +OMARCHY_REPO="${OMARCHY_REPO:-nilszeilon/armarchy}" echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git" rm -rf ~/.local/share/omarchy/ From bc61f044b0e968d104acce455266d49b0ec7b4b1 Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Thu, 14 Aug 2025 22:19:34 +0200 Subject: [PATCH 04/27] install lazydocker instead of the bin (x86-64 arch only) --- install/development/development.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/install/development/development.sh b/install/development/development.sh index 20d895738d..8f1d761c1d 100644 --- a/install/development/development.sh +++ b/install/development/development.sh @@ -1,8 +1,17 @@ #!/bin/bash -yay -S --noconfirm --needed \ - cargo clang llvm mise \ - imagemagick \ - mariadb-libs postgresql-libs \ - github-cli \ - lazygit lazydocker-bin +if [ -z "$OMARCHY_ARM" ]; then + yay -S --noconfirm --needed \ + cargo clang llvm mise \ + imagemagick \ + mariadb-libs postgresql-libs \ + github-cli \ + lazygit lazydocker-bin +else + yay -S --noconfirm --needed \ + cargo clang llvm mise \ + imagemagick \ + mariadb-libs postgresql-libs \ + github-cli \ + lazygit lazydocker +fi From 3579251d6c1039ccdb86066f3f8db8ead53cb5ed Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Thu, 14 Aug 2025 22:24:56 +0200 Subject: [PATCH 05/27] install guide for MacOS dual boot with omarchy --- INSTALL_GUIDE.md | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 INSTALL_GUIDE.md diff --git a/INSTALL_GUIDE.md b/INSTALL_GUIDE.md new file mode 100644 index 0000000000..0e938e24c0 --- /dev/null +++ b/INSTALL_GUIDE.md @@ -0,0 +1,84 @@ +# Install guide macbook m-series (m1 & m2) + +## Dual boot Asahi-alarm + + +### installation + +Follow the instructions on how to dual boot your macbook with asahi-alarm here + +https://asahi-alarm.org/ + +**Choose the minimal installation!** + +This will create a new partition on your machine and install arch on it! + +### get internet +Follow these instructions once the installation is complete [manual installation guide](https://github.com/asahi-alarm/asahi-alarm/blob/main/manual-install.md) + +This lets you set up wifi for your laptop. + +### Create a user + +Now we are logged in as root, lets create a user + + ``` + +# Install sudo package +pacman -S sudo + +# Create a new user with home directory +useradd -m youruser # Replace 'youruser' with your desired username + +# Set password for the new user +passwd youruser + +# Add user to the wheel group (for sudo access) +usermod -aG wheel youruser +``` + +run `visudo` and look for the line and uncomment it + + +``` +# %wheel ALL=(ALL:ALL) ALL +``` + + +## Install omarchy + +first we need to install the package wget + +``` +pacman -S wget +``` + +to install omarchy we need to run as the user we just created before, run the command + +``` +su - youruser +``` + + +now lets install omarchy, run the command + + +``` +wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boot.sh | OMARCHY_BARE=true OMARCHY_ARM=true bash +``` + +if nothing happens, check that you typed in the correct url before piping to bash with + +``` +wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boot.sh +``` + +This step will take some time. + + + +# Uninstall + +Uninstall is super easy, big recommend to this guy + +https://youtu.be/nMnWTq2H-N0?si=7RsKKRSC5n9-aboF From ac884981f07fe75b35dbb61812b41ed958866d77 Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Thu, 14 Aug 2025 23:46:49 +0200 Subject: [PATCH 06/27] comment out 1password stuff --- default/hypr/apps.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/default/hypr/apps.conf b/default/hypr/apps.conf index 8e87bfdd0d..faf144861d 100644 --- a/default/hypr/apps.conf +++ b/default/hypr/apps.conf @@ -6,5 +6,3 @@ source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf source = ~/.local/share/omarchy/default/hypr/apps/steam.conf source = ~/.local/share/omarchy/default/hypr/apps/system.conf source = ~/.local/share/omarchy/default/hypr/apps/walker.conf -source = ~/.local/share/omarchy/default/hypr/apps/1password.conf -source = ~/.local/share/omarchy/default/hypr/apps/zoom.conf From 3ff7d5503a5c78207f2123a52d57a074c1a556b7 Mon Sep 17 00:00:00 2001 From: nilszeilon Date: Fri, 15 Aug 2025 09:25:16 +0200 Subject: [PATCH 07/27] fix menu commands with vulkan setting --- install/config/config.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install/config/config.sh b/install/config/config.sh index f42f96f927..1b08675ab2 100644 --- a/install/config/config.sh +++ b/install/config/config.sh @@ -15,6 +15,10 @@ if [ -n "$OMARCHY_BARE" ]; then touch ~/.local/state/omarchy/bare.mode fi +if [ -n "$OMARCHY_ARM" ]; then + echo "env = VK_ICD_FILENAMES,/usr/share/vulkan/icd.d/lvp_icd.aarch64.json" >> ~/.config/hypr/envs.conf +fi + # Setup GPG configuration with multiple keyservers for better reliability sudo mkdir -p /etc/gnupg sudo cp ~/.local/share/omarchy/default/gpg/dirmngr.conf /etc/gnupg/ From 07fd615a0c1b407f2a81434842b546be8a910a21 Mon Sep 17 00:00:00 2001 From: nilszeilon Date: Fri, 15 Aug 2025 09:37:36 +0200 Subject: [PATCH 08/27] Autoselect BARE if we install with OMARCHY_ARM --- install/preflight/guard.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/install/preflight/guard.sh b/install/preflight/guard.sh index 41cac6e619..57f3ec7faf 100644 --- a/install/preflight/guard.sh +++ b/install/preflight/guard.sh @@ -25,6 +25,11 @@ else [[ "$arch" != "aarch64" && "$arch" != "arm64" ]] && abort "ARM CPU" fi +# if we install on m1 or m2 macbook then we should install BARE +if [ -n "$OMARCHY_ARM"]; then + export OMARCHY_BARE=true +fi + # Must not have Gnome or KDE already install pacman -Qe gnome-shell &>/dev/null && abort "Fresh + Vanilla Arch" pacman -Qe plasma-desktop &>/dev/null && abort "Fresh + Vanilla Arch" From e3cb709d4e54c1eafa22e41c70a2007da826f536 Mon Sep 17 00:00:00 2001 From: nilszeilon Date: Fri, 15 Aug 2025 09:52:45 +0200 Subject: [PATCH 09/27] fix typo --- install/preflight/guard.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/preflight/guard.sh b/install/preflight/guard.sh index 57f3ec7faf..1eab73ff20 100644 --- a/install/preflight/guard.sh +++ b/install/preflight/guard.sh @@ -26,7 +26,7 @@ else fi # if we install on m1 or m2 macbook then we should install BARE -if [ -n "$OMARCHY_ARM"]; then +if [ -n "$OMARCHY_ARM" ]; then export OMARCHY_BARE=true fi From 671cf225eb865c2739dbdf45e9b78a2843cce683 Mon Sep 17 00:00:00 2001 From: nilszeilon Date: Fri, 15 Aug 2025 10:08:39 +0200 Subject: [PATCH 10/27] update docs on how to handle errors installing. --- INSTALL_GUIDE.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/INSTALL_GUIDE.md b/INSTALL_GUIDE.md index 0e938e24c0..3167928594 100644 --- a/INSTALL_GUIDE.md +++ b/INSTALL_GUIDE.md @@ -75,6 +75,9 @@ wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boo This step will take some time. +If you run into problems where the AUR is slow, try to enable mirror repositories by editing `sudo vim /etc/pacman.d/mirrorlist` and uncomment a couple of lines starting with `# Server = ...`. + +**If the installation crashes** just run the suggested command but with the `OMARCHY_ARM` flag set like this `OMARCHY_ARM=true bash ~/.local/share/omarchy/install.sh` until it finishes. # Uninstall From 9a307b176e6116ba9ef6b567c97e04b236ee33fc Mon Sep 17 00:00:00 2001 From: nilszeilon Date: Fri, 15 Aug 2025 10:12:59 +0200 Subject: [PATCH 11/27] You only have to spec OMARCHY_ARM --- INSTALL_GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL_GUIDE.md b/INSTALL_GUIDE.md index 3167928594..38b1907fe7 100644 --- a/INSTALL_GUIDE.md +++ b/INSTALL_GUIDE.md @@ -64,7 +64,7 @@ now lets install omarchy, run the command ``` -wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boot.sh | OMARCHY_BARE=true OMARCHY_ARM=true bash +wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boot.sh | OMARCHY_ARM=true bash ``` if nothing happens, check that you typed in the correct url before piping to bash with From 948cb23da6be5caac59b8dac47b55afc46a4ebd0 Mon Sep 17 00:00:00 2001 From: nilszeilon Date: Fri, 15 Aug 2025 10:30:20 +0200 Subject: [PATCH 12/27] add considerations to the installation guide --- INSTALL_GUIDE.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/INSTALL_GUIDE.md b/INSTALL_GUIDE.md index 38b1907fe7..ed9c5166a7 100644 --- a/INSTALL_GUIDE.md +++ b/INSTALL_GUIDE.md @@ -1,18 +1,31 @@ # Install guide macbook m-series (m1 & m2) -## Dual boot Asahi-alarm +⚠️⚠️⚠️**This is experimental and might leave your machine in an unusuable state.**⚠️⚠️⚠️ +## before we start -### installation +Installation requires a dual boot of your macbook. This means Omarchy will live side by side with your existing macOS. + +If you don't have space on your machine I recommend looking at the top comment on this reddit thread: +https://www.reddit.com/r/MacOS/comments/154rp99/how_to_do_i_clear_system_data_on_mac_os/ -Follow the instructions on how to dual boot your macbook with asahi-alarm here +This and removing a bunch of unused files removed about 100gb of data to available space for omarchy. -https://asahi-alarm.org/ +You should always back up any data or files that you don't want to lose. + +## Dual boot Asahi-alarm + +### installation + +Follow the instructions on how to dual boot your macbook with asahi-alarm **Choose the minimal installation!** This will create a new partition on your machine and install arch on it! +Follow these instructions: https://asahi-alarm.org/ + + ### get internet Follow these instructions once the installation is complete [manual installation guide](https://github.com/asahi-alarm/asahi-alarm/blob/main/manual-install.md) @@ -24,9 +37,6 @@ Now we are logged in as root, lets create a user ``` -# Install sudo package -pacman -S sudo - # Create a new user with home directory useradd -m youruser # Replace 'youruser' with your desired username @@ -75,9 +85,9 @@ wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boo This step will take some time. -If you run into problems where the AUR is slow, try to enable mirror repositories by editing `sudo vim /etc/pacman.d/mirrorlist` and uncomment a couple of lines starting with `# Server = ...`. +If you run into problems where the AUR is slow, try to enable mirror repositories by editing `sudo vim /etc/pacman.d/mirrorlist` and uncomment a couple of lines starting with `# Server = ...`. -**If the installation crashes** just run the suggested command but with the `OMARCHY_ARM` flag set like this `OMARCHY_ARM=true bash ~/.local/share/omarchy/install.sh` until it finishes. +**If the installation crashes** - just run the suggested command but with the `OMARCHY_ARM` flag set like this `OMARCHY_ARM=true bash ~/.local/share/omarchy/install.sh` until it finishes. # Uninstall From 3b1aafc8a006ab862dd908bb86c56ee8b3448e58 Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Fri, 15 Aug 2025 14:55:39 +0000 Subject: [PATCH 13/27] install pipewire for audio --- install.sh | 1 + install/desktop/audio.sh | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 install/desktop/audio.sh diff --git a/install.sh b/install.sh index 5bea566f09..1fcc2a99fb 100755 --- a/install.sh +++ b/install.sh @@ -66,6 +66,7 @@ source $OMARCHY_INSTALL/desktop/hyprlandia.sh source $OMARCHY_INSTALL/desktop/theme.sh source $OMARCHY_INSTALL/desktop/bluetooth.sh source $OMARCHY_INSTALL/desktop/asdcontrol.sh +source $OMARCHY_INSTALL/desktop/audio.sh source $OMARCHY_INSTALL/desktop/fonts.sh source $OMARCHY_INSTALL/desktop/printer.sh diff --git a/install/desktop/audio.sh b/install/desktop/audio.sh new file mode 100644 index 0000000000..0e8dc9c865 --- /dev/null +++ b/install/desktop/audio.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# on macbook m-series we need pipewire +if [ -n "$OMARCHY_ARM" ]; then + yay -S --needed pipewire-alsa pipewire-pulse wireplumber pipewire-jack +fi From f1dcbbe94741c03d4abc3bbd5b1872dae0ddf51b Mon Sep 17 00:00:00 2001 From: "Nils Barr Zeilon@gmail.com" Date: Sat, 16 Aug 2025 17:47:02 +0000 Subject: [PATCH 14/27] add noconfirm flag to install of pipewire (conflict with jack) and add asahi-audio for speaker support --- install/desktop/audio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/desktop/audio.sh b/install/desktop/audio.sh index 0e8dc9c865..82bc753fa5 100644 --- a/install/desktop/audio.sh +++ b/install/desktop/audio.sh @@ -2,5 +2,5 @@ # on macbook m-series we need pipewire if [ -n "$OMARCHY_ARM" ]; then - yay -S --needed pipewire-alsa pipewire-pulse wireplumber pipewire-jack + yay -S --needed --noconfirm pipewire-alsa pipewire-pulse wireplumber pipewire-jack asahi-audio fi From 1b57c8976b8ddaf0772ac3ca29639a10f011d89c Mon Sep 17 00:00:00 2001 From: "Nils Barr Zeilon@gmail.com" Date: Sat, 16 Aug 2025 21:35:25 +0000 Subject: [PATCH 15/27] fix typo --- INSTALL_GUIDE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL_GUIDE.md b/INSTALL_GUIDE.md index ed9c5166a7..f768745c55 100644 --- a/INSTALL_GUIDE.md +++ b/INSTALL_GUIDE.md @@ -74,13 +74,13 @@ now lets install omarchy, run the command ``` -wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boot.sh | OMARCHY_ARM=true bash +wget -qO- https://githubusercontent.com/nilszeilon/armarchy/refs/heads/master/boot.sh | OMARCHY_ARM=true bash ``` if nothing happens, check that you typed in the correct url before piping to bash with ``` -wget -qO- https://githubusercontent.com/nilszeion/armarchy/refs/heads/master/boot.sh +wget -qO- https://githubusercontent.com/nilszeilon/armarchy/refs/heads/master/boot.sh ``` This step will take some time. From 12a2526bf5441a7d3c34eca5cda24dedc57db30c Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Sun, 17 Aug 2025 13:28:17 +0200 Subject: [PATCH 16/27] fix install url --- INSTALL_GUIDE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL_GUIDE.md b/INSTALL_GUIDE.md index f768745c55..41d1812105 100644 --- a/INSTALL_GUIDE.md +++ b/INSTALL_GUIDE.md @@ -74,13 +74,13 @@ now lets install omarchy, run the command ``` -wget -qO- https://githubusercontent.com/nilszeilon/armarchy/refs/heads/master/boot.sh | OMARCHY_ARM=true bash +wget -qO- https://raw.githubusercontent.com/nilszeilon/armarchy/refs/heads/master/boot.sh | OMARCHY_ARM=true bash ``` if nothing happens, check that you typed in the correct url before piping to bash with ``` -wget -qO- https://githubusercontent.com/nilszeilon/armarchy/refs/heads/master/boot.sh +wget -qO- https://raw.githubusercontent.com/nilszeilon/armarchy/refs/heads/master/boot.sh ``` This step will take some time. From 12d9478b87ba5abd58ecc3dc327ceb13e06c3026 Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Sun, 17 Aug 2025 20:13:14 +0200 Subject: [PATCH 17/27] auto-detect ARM arch --- install/preflight/guard.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/install/preflight/guard.sh b/install/preflight/guard.sh index 1eab73ff20..bc2b4117a6 100644 --- a/install/preflight/guard.sh +++ b/install/preflight/guard.sh @@ -17,19 +17,22 @@ done # Must not be running as root [ "$EUID" -eq 0 ] && abort "Running as user (not root)" -# Must be x86 only to fully work, or ARM if OMARCHY_ARM is set +# Auto-detect ARM architecture and set flags +arch=$(uname -m) +if [[ "$arch" == "aarch64" || "$arch" == "arm64" ]]; then + export OMARCHY_ARM=true + export OMARCHY_BARE=true + echo "Auto-detected ARM architecture: $arch" + echo "Setting OMARCHY_ARM=true and OMARCHY_BARE=true" +fi + +# Must be x86 or ARM architecture if [ -z "$OMARCHY_ARM" ]; then [ "$(uname -m)" != "x86_64" ] && abort "x86_64 CPU" else - arch=$(uname -m) [[ "$arch" != "aarch64" && "$arch" != "arm64" ]] && abort "ARM CPU" fi -# if we install on m1 or m2 macbook then we should install BARE -if [ -n "$OMARCHY_ARM" ]; then - export OMARCHY_BARE=true -fi - # Must not have Gnome or KDE already install pacman -Qe gnome-shell &>/dev/null && abort "Fresh + Vanilla Arch" pacman -Qe plasma-desktop &>/dev/null && abort "Fresh + Vanilla Arch" From 95586fb9570a6c58f2b2672d5eb989762e1ae2fe Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Sun, 17 Aug 2025 22:08:03 +0200 Subject: [PATCH 18/27] add arm to state for exclusions --- install/config/config.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/install/config/config.sh b/install/config/config.sh index 1b08675ab2..5fb45a52a0 100644 --- a/install/config/config.sh +++ b/install/config/config.sh @@ -15,9 +15,15 @@ if [ -n "$OMARCHY_BARE" ]; then touch ~/.local/state/omarchy/bare.mode fi +# If arm arch, allow a way for its exclusions to not get added in updates & configs if [ -n "$OMARCHY_ARM" ]; then - echo "env = VK_ICD_FILENAMES,/usr/share/vulkan/icd.d/lvp_icd.aarch64.json" >> ~/.config/hypr/envs.conf -fi + mkdir -p ~/.local/state/omarchy + touch ~/.local/state/omarchy/arm.mode +fi + +if [ -n "$OMARCHY_ARM" ]; then + echo "env = VK_ICD_FILENAMES,/usr/share/vulkan/icd.d/lvp_icd.aarch64.json" >>~/.config/hypr/envs.conf +fi # Setup GPG configuration with multiple keyservers for better reliability sudo mkdir -p /etc/gnupg From cdeac85fef282707df49a6a0e521a965e8128dbb Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Sun, 17 Aug 2025 22:09:06 +0200 Subject: [PATCH 19/27] source 1password configs only on x86 --- default/hypr/apps.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/default/hypr/apps.conf b/default/hypr/apps.conf index faf144861d..592ed312a4 100644 --- a/default/hypr/apps.conf +++ b/default/hypr/apps.conf @@ -6,3 +6,8 @@ source = ~/.local/share/omarchy/default/hypr/apps/retroarch.conf source = ~/.local/share/omarchy/default/hypr/apps/steam.conf source = ~/.local/share/omarchy/default/hypr/apps/system.conf source = ~/.local/share/omarchy/default/hypr/apps/walker.conf + +if [[ ! -f ~/.local/state/omarchy/arm.mode ]]; then + source = ~/.local/share/omarchy/default/hypr/apps/1password.conf + source = ~/.local/share/omarchy/default/hypr/apps/zoom.conf +fi From 3b0716b1780037f442260da654e2847e66667051 Mon Sep 17 00:00:00 2001 From: Nils Barr Zeilon Date: Sun, 17 Aug 2025 22:13:51 +0200 Subject: [PATCH 20/27] migrate state for arm users --- migrations/1755244361.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 migrations/1755244361.sh diff --git a/migrations/1755244361.sh b/migrations/1755244361.sh new file mode 100644 index 0000000000..8011a7f3fd --- /dev/null +++ b/migrations/1755244361.sh @@ -0,0 +1,8 @@ +# Add state for arm achitecture +if [[ $(uname -m) == "arm"* || $(uname -m) == "aarch64" || -n "$OMARCHY_ARM" ]]; then + # Do something for ARM + echo "Running on ARM architecture" + + mkdir -p ~/.local/state/omarchy + touch ~/.local/state/omarchy/arm.mode +fi From 22bd54b4c5cc4b0f912b316322823de577992d51 Mon Sep 17 00:00:00 2001 From: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> Date: Mon, 18 Aug 2025 16:00:35 -0600 Subject: [PATCH 21/27] use env var OMARCHY_ASAHI_ARM for asahi linux dependencies --- install/desktop/audio.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install/desktop/audio.sh b/install/desktop/audio.sh index 82bc753fa5..6d0ac577b0 100644 --- a/install/desktop/audio.sh +++ b/install/desktop/audio.sh @@ -2,5 +2,9 @@ # on macbook m-series we need pipewire if [ -n "$OMARCHY_ARM" ]; then - yay -S --needed --noconfirm pipewire-alsa pipewire-pulse wireplumber pipewire-jack asahi-audio + yay -S --needed --noconfirm pipewire-alsa pipewire-pulse wireplumber pipewire-jack fi + +if [ -n "$OMARCHY_ASAHI_ARM" ]; then + yay -S --needed --noconfirm asahi-audio +fi \ No newline at end of file From 53ec9353b614088c951d2432b1fb0c58bedbbdc2 Mon Sep 17 00:00:00 2001 From: Patrick Rodrigues Date: Mon, 18 Aug 2025 16:41:05 -0600 Subject: [PATCH 22/27] move pipewire-jack to asahi Signed-off-by: Patrick Rodrigues --- install/desktop/audio.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/desktop/audio.sh b/install/desktop/audio.sh index 6d0ac577b0..8f1bc3c7e4 100644 --- a/install/desktop/audio.sh +++ b/install/desktop/audio.sh @@ -2,9 +2,9 @@ # on macbook m-series we need pipewire if [ -n "$OMARCHY_ARM" ]; then - yay -S --needed --noconfirm pipewire-alsa pipewire-pulse wireplumber pipewire-jack + yay -S --needed --noconfirm pipewire-alsa pipewire-pulse wireplumber fi if [ -n "$OMARCHY_ASAHI_ARM" ]; then - yay -S --needed --noconfirm asahi-audio + yay -S --needed --noconfirm pipewire-jack asahi-audio fi \ No newline at end of file From ad46b052c4e5c1696a83fea4bec46995962a942e Mon Sep 17 00:00:00 2001 From: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> Date: Mon, 18 Aug 2025 16:51:06 -0600 Subject: [PATCH 23/27] change repo default name Signed-off-by: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> --- boot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.sh b/boot.sh index 564787f9b2..45b91bd8f4 100755 --- a/boot.sh +++ b/boot.sh @@ -17,7 +17,7 @@ echo -e "\n$ansi_art\n" sudo pacman -Sy --noconfirm --needed git # Use custom repo if specified, otherwise default to basecamp/omarchy -OMARCHY_REPO="${OMARCHY_REPO:-nilszeilon/armarchy}" +OMARCHY_REPO="${OMARCHY_REPO:-pythrick/armarchy}" echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git" rm -rf ~/.local/share/omarchy/ From 7bbfb129def571fb2c91471961118c8b502c916f Mon Sep 17 00:00:00 2001 From: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> Date: Mon, 18 Aug 2025 16:57:14 -0600 Subject: [PATCH 24/27] move audio install to asahi only Signed-off-by: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> --- install/desktop/audio.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/install/desktop/audio.sh b/install/desktop/audio.sh index 8f1bc3c7e4..14e0e6e289 100644 --- a/install/desktop/audio.sh +++ b/install/desktop/audio.sh @@ -1,10 +1,6 @@ #!/bin/bash # on macbook m-series we need pipewire -if [ -n "$OMARCHY_ARM" ]; then - yay -S --needed --noconfirm pipewire-alsa pipewire-pulse wireplumber -fi - if [ -n "$OMARCHY_ASAHI_ARM" ]; then - yay -S --needed --noconfirm pipewire-jack asahi-audio -fi \ No newline at end of file + yay -S --needed --noconfirm pipewire-alsa pipewire-pulse wireplumber pipewire-jack asahi-audio +fi From 23f670dd5e9486a216bc8cf24296a38ac596392c Mon Sep 17 00:00:00 2001 From: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> Date: Mon, 18 Aug 2025 17:02:44 -0600 Subject: [PATCH 25/27] remove audio Signed-off-by: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 1fcc2a99fb..f55ec56122 100755 --- a/install.sh +++ b/install.sh @@ -66,7 +66,7 @@ source $OMARCHY_INSTALL/desktop/hyprlandia.sh source $OMARCHY_INSTALL/desktop/theme.sh source $OMARCHY_INSTALL/desktop/bluetooth.sh source $OMARCHY_INSTALL/desktop/asdcontrol.sh -source $OMARCHY_INSTALL/desktop/audio.sh +#source $OMARCHY_INSTALL/desktop/audio.sh source $OMARCHY_INSTALL/desktop/fonts.sh source $OMARCHY_INSTALL/desktop/printer.sh From be06b47899390ac00ed503e79d6c5e9993ad9c41 Mon Sep 17 00:00:00 2001 From: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> Date: Mon, 18 Aug 2025 17:32:08 -0600 Subject: [PATCH 26/27] use brave instead of chromium for arm Signed-off-by: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> --- bin/omarchy-menu | 6 +++++- bin/omarchy-theme-set | 16 +++++++++++----- bin/omarchy-webapp-install | 16 +++++++++++++++- bin/omarchy-webapp-remove | 2 ++ install/desktop/desktop.sh | 9 +++++++-- 5 files changed, 40 insertions(+), 9 deletions(-) diff --git a/bin/omarchy-menu b/bin/omarchy-menu index 5bc88dbd88..11855778cf 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -35,7 +35,11 @@ edit_in_nvim() { } open_web() { - setsid chromium --new-window --app="$1" & + if [ -n "$OMARCHY_ARM" ]; then + setsid brave --new-window --app="$1" & + else + setsid chromium --new-window --app="$1" & + fi } install() { diff --git a/bin/omarchy-theme-set b/bin/omarchy-theme-set index 81607137ec..b74d59e61c 100755 --- a/bin/omarchy-theme-set +++ b/bin/omarchy-theme-set @@ -39,12 +39,18 @@ else gsettings set org.gnome.desktop.interface icon-theme "Yaru-blue" fi -# Change Chromium colors -if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then - chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)" +if [ -n "$OMARCHY_ARM" ]; then + # Change Brave colors + # TODO: temporary + brave --no-startup-window --set-theme-color="28,32,39" else - # Use a default, neutral grey if theme doesn't have a color - chromium --no-startup-window --set-theme-color="28,32,39" + # Change Chromium colors + if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then + chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)" + else + # Use a default, neutral grey if theme doesn't have a color + chromium --no-startup-window --set-theme-color="28,32,39" + fi fi # Trigger alacritty config reload diff --git a/bin/omarchy-webapp-install b/bin/omarchy-webapp-install index b54a881f47..b37e1daa32 100755 --- a/bin/omarchy-webapp-install +++ b/bin/omarchy-webapp-install @@ -27,7 +27,20 @@ if ! curl -sL -o "$ICON_PATH" "$ICON_URL"; then return 1 fi -cat >"$DESKTOP_FILE" <"$DESKTOP_FILE" <"$DESKTOP_FILE" < Date: Mon, 18 Aug 2025 17:36:07 -0600 Subject: [PATCH 27/27] fix brave install Signed-off-by: Patrick Rodrigues <23041890+pythrick@users.noreply.github.com> --- install/desktop/desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/desktop/desktop.sh b/install/desktop/desktop.sh index fac4752527..d7836754ec 100644 --- a/install/desktop/desktop.sh +++ b/install/desktop/desktop.sh @@ -8,7 +8,7 @@ yay -S --noconfirm --needed \ mpv evince imv if [ -n "$OMARCHY_ARM" ]; then - yay -S --noconfirm --needed brave + curl -fsS https://dl.brave.com/install.sh | sh else yay -S --noconfirm --needed omarchy-chromium-bin fi