From 613f4a473db5a891f3192c5d692e711238a24615 Mon Sep 17 00:00:00 2001 From: Michiel Ryvers Date: Wed, 27 Aug 2025 11:08:16 +0200 Subject: [PATCH 01/11] Don't hardcode snapper configs, read the config list first --- bin/omarchy-snapshot | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/omarchy-snapshot b/bin/omarchy-snapshot index b4d78f1..3813ef5 100755 --- a/bin/omarchy-snapshot +++ b/bin/omarchy-snapshot @@ -16,7 +16,10 @@ case "$COMMAND" in create) DESC="$(omarchy-version)" - for config in root home; do + # Get existing snapper config names from CSV output + mapfile -t CONFIGS < <(sudo snapper --csvout list-configs | awk -F, 'NR>1 {print $1}') + + for config in "${CONFIGS[@]}"; do sudo snapper -c "$config" create -c number -d "$DESC" done ;; From 6e3d023fee64d030519ebd88ad0e5ac0c5ac7997 Mon Sep 17 00:00:00 2001 From: Roberto Aguilar Date: Wed, 27 Aug 2025 23:55:51 -0600 Subject: [PATCH 02/11] Install `node` as part of Laravel's dev env (#1201) When running `laravel new`, if a starter kit like `React` or `Vue` are selected, the installer will ask: ``` Would you like to run npm install and npm run build? ``` And in order for it to work, `npm` should be available. Having this installed will definitively smooth out the experience from install to up-and-running! --- bin/omarchy-install-dev-env | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/omarchy-install-dev-env b/bin/omarchy-install-dev-env index 5453e8d..1865992 100755 --- a/bin/omarchy-install-dev-env +++ b/bin/omarchy-install-dev-env @@ -33,6 +33,11 @@ install_php() { done } +install_node() { + echo -e "Installing Node.js...\n" + mise use --global node@lts +} + case "$1" in ruby) echo -e "Installing Ruby on Rails...\n" @@ -42,8 +47,7 @@ ruby) echo -e "\nYou can now run: rails new myproject" ;; node) - echo -e "Installing Node.js...\n" - mise use --global node@lts + install_node ;; bun) echo -e "Installing Bun...\n" @@ -64,6 +68,7 @@ php) laravel) echo -e "Installing PHP and Laravel...\n" install_php + install_node composer global require laravel/installer echo -e "\nYou can now run: laravel new myproject" ;; From 30ad634349cd0011aa96bb0269e9e66ccf69865a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 08:47:42 +0200 Subject: [PATCH 03/11] Move OPR behind Arch default repos (#1229) * Move OPR behind Arch default repos * No longer first --- install/preflight/repositories.sh | 4 ++-- migrations/1756360551.sh | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 migrations/1756360551.sh diff --git a/install/preflight/repositories.sh b/install/preflight/repositories.sh index c368955..5256ba8 100755 --- a/install/preflight/repositories.sh +++ b/install/preflight/repositories.sh @@ -8,9 +8,9 @@ if ! grep -q "ILoveCandy" /etc/pacman.conf; then sudo sed -i '/^\[options\]/a Color\nILoveCandy\nVerbosePkgLists' /etc/pacman.conf fi -# Add the Omarchy repository as first choice +# Add the Omarchy repository if ! grep -q "omarchy" /etc/pacman.conf; then - sudo sed -i '/^\[core\]/i [omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' /etc/pacman.conf + echo -e '\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' | sudo tee -a /etc/pacman.conf >/dev/null fi # Set mirrors to global ones only diff --git a/migrations/1756360551.sh b/migrations/1756360551.sh new file mode 100644 index 0000000..a87dc54 --- /dev/null +++ b/migrations/1756360551.sh @@ -0,0 +1,6 @@ +echo "Move Omarchy Package Repository after Arch core/extra/multilib for extra security on resolution" + +sudo cp /etc/pacman.conf /etc/pacman.conf.bak +sudo sed -i '/\[omarchy\]/,+2 d' /etc/pacman.conf +sudo sed -i '/\[chaotic-aur\]/i\[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/\n' /etc/pacman.conf || + sudo bash -c 'echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/$arch/" >> /etc/pacman.conf' From 33d6d3833250fe842073cfbee14d764d2c416f6d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 09:05:26 +0200 Subject: [PATCH 04/11] Include Omarchy branch in About (#1231) --- bin/omarchy-version-branch | 3 +++ config/fastfetch/config.jsonc | 6 ++++++ migrations/1756363651.sh | 3 +++ 3 files changed, 12 insertions(+) create mode 100755 bin/omarchy-version-branch create mode 100644 migrations/1756363651.sh diff --git a/bin/omarchy-version-branch b/bin/omarchy-version-branch new file mode 100755 index 0000000..43281d9 --- /dev/null +++ b/bin/omarchy-version-branch @@ -0,0 +1,3 @@ +#!/bin/bash + +echo $(git -C "$OMARCHY_PATH" rev-parse --abbrev-ref HEAD) diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index 316f441..b2cad35 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -68,6 +68,12 @@ "keyColor": "blue", "text": "version=$(omarchy-version); echo \"Omarchy $version\"" }, + { + "type": "command", + "key": "│ ├󰘬", + "keyColor": "blue", + "text": "branch=$(omarchy-version-branch); echo \"$branch\"" + }, { "type": "kernel", "key": "│ ├", diff --git a/migrations/1756363651.sh b/migrations/1756363651.sh new file mode 100644 index 0000000..3df0985 --- /dev/null +++ b/migrations/1756363651.sh @@ -0,0 +1,3 @@ +echo "Update About config to include the Omarchy branch name" + +omarchy-refresh-fastfetch From 06b15257e2e45e07679bbee2ed18c0de897087c8 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 09:21:47 +0200 Subject: [PATCH 05/11] Fix repo setup --- install/preflight/repositories.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/preflight/repositories.sh b/install/preflight/repositories.sh index 5256ba8..0e53313 100755 --- a/install/preflight/repositories.sh +++ b/install/preflight/repositories.sh @@ -10,7 +10,7 @@ fi # Add the Omarchy repository if ! grep -q "omarchy" /etc/pacman.conf; then - echo -e '\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https:\/\/pkgs.omarchy.org\/$arch\/\n' | sudo tee -a /etc/pacman.conf >/dev/null + echo -e "\n[omarchy]\nSigLevel = Optional TrustAll\nServer = https://pkgs.omarchy.org/\$arch/\n" | sudo tee -a /etc/pacman.conf >/dev/null fi # Set mirrors to global ones only From 3f2e282c46104713d8a95a1ae9d1fa40c6fbef6a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 10:29:36 +0200 Subject: [PATCH 06/11] Ensure walker doesn't walk off into the night Closes #1226 --- migrations/1756365707.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 migrations/1756365707.sh diff --git a/migrations/1756365707.sh b/migrations/1756365707.sh new file mode 100644 index 0000000..dc8c60d --- /dev/null +++ b/migrations/1756365707.sh @@ -0,0 +1,4 @@ +# FIXME: This really shouldn't happen, need to find out why! +echo "Ensure walker is present" + +sudo pacman -Syu --needed --noconfirm walker-bin From e3df85ba8ca512a8aa837a4e5556f1cd34418def Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 10:41:05 +0200 Subject: [PATCH 07/11] Switch to the new Font Awesome 7.0 package --- install/packages.sh | 2 +- migrations/1756369776.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 migrations/1756369776.sh diff --git a/install/packages.sh b/install/packages.sh index 7800d23..f50233a 100644 --- a/install/packages.sh +++ b/install/packages.sh @@ -95,7 +95,6 @@ sudo pacman -S --noconfirm --needed \ tldr \ tree-sitter-cli \ ttf-cascadia-mono-nerd \ - ttf-font-awesome \ ttf-ia-writer \ ttf-jetbrains-mono \ typora \ @@ -113,6 +112,7 @@ sudo pacman -S --noconfirm --needed \ wl-clip-persist \ wl-clipboard \ wl-screenrec \ + woff2-font-awesome \ xdg-desktop-portal-gtk \ xdg-desktop-portal-hyprland \ xmlstarlet \ diff --git a/migrations/1756369776.sh b/migrations/1756369776.sh new file mode 100644 index 0000000..9b33e74 --- /dev/null +++ b/migrations/1756369776.sh @@ -0,0 +1,4 @@ +echo "Move to the new woff2 format for Font Awesome 7.0" + +sudo pacman -S --noconfirm --needed woff2-font-awesome +sudo pacman -Rns --noconfirm ttf-font-awesome || true From 69f5c62f8f4560460a968f97f33ffea3b6a16653 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 10:42:41 +0200 Subject: [PATCH 08/11] pacman actually does this itself --- migrations/1756369776.sh | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 migrations/1756369776.sh diff --git a/migrations/1756369776.sh b/migrations/1756369776.sh deleted file mode 100644 index 9b33e74..0000000 --- a/migrations/1756369776.sh +++ /dev/null @@ -1,4 +0,0 @@ -echo "Move to the new woff2 format for Font Awesome 7.0" - -sudo pacman -S --noconfirm --needed woff2-font-awesome -sudo pacman -Rns --noconfirm ttf-font-awesome || true From 91dadc905d7ee1d6015a77625d97a4267288f70b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 10:50:20 +0200 Subject: [PATCH 09/11] Let user know why we are asking for sudo --- bin/omarchy-snapshot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/omarchy-snapshot b/bin/omarchy-snapshot index b4d78f1..5600b9e 100755 --- a/bin/omarchy-snapshot +++ b/bin/omarchy-snapshot @@ -16,9 +16,11 @@ case "$COMMAND" in create) DESC="$(omarchy-version)" + echo -e "\e[32mCreate system snapshot\e[0m" for config in root home; do sudo snapper -c "$config" create -c number -d "$DESC" done + echo ;; restore) sudo limine-snapper-restore From b4d76cecdf6230810e02776f0c6c942c630e020a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 28 Aug 2025 10:58:39 +0200 Subject: [PATCH 10/11] Stop restarting waybar on unlock to see if we have solved the stacking problem for good --- config/hypr/hypridle.conf | 1 - migrations/1756371020.sh | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 migrations/1756371020.sh diff --git a/config/hypr/hypridle.conf b/config/hypr/hypridle.conf index 7b98072..f2245a7 100644 --- a/config/hypr/hypridle.conf +++ b/config/hypr/hypridle.conf @@ -2,7 +2,6 @@ general { lock_cmd = omarchy-lock-screen # lock screen and 1password before_sleep_cmd = loginctl lock-session # lock before suspend. after_sleep_cmd = hyprctl dispatch dpms on # to avoid having to press a key twice to turn on the display. - on_unlock_cmd = omarchy-restart-waybar # prevent stacking of waybar when waking inhibit_sleep = 3 # wait until screen is locked } diff --git a/migrations/1756371020.sh b/migrations/1756371020.sh new file mode 100644 index 0000000..f629b59 --- /dev/null +++ b/migrations/1756371020.sh @@ -0,0 +1,3 @@ +echo "Stop restarting waybar on unlock to see if we have solved the stacking problem for good" + +omarchy-refresh-hypridle From 5f2b6566f12b65530ae22d79b35706388bae0704 Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Thu, 28 Aug 2025 12:11:26 +0300 Subject: [PATCH 11/11] Add missing configs if user already had snapper --- migrations/1756153445.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 migrations/1756153445.sh diff --git a/migrations/1756153445.sh b/migrations/1756153445.sh new file mode 100644 index 0000000..63441e2 --- /dev/null +++ b/migrations/1756153445.sh @@ -0,0 +1,10 @@ +echo "Checking and correcting Snapper configs if needed" +if command -v snapper &>/dev/null; then + if ! sudo snapper list-configs 2>/dev/null | grep -q "root"; then + sudo snapper -c root create-config / + fi + + if ! sudo snapper list-configs 2>/dev/null | grep -q "home"; then + sudo snapper -c home create-config /home + fi +fi