From 66818266ffe0c683436d2e795898b61308baff9d Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 26 Aug 2025 12:46:19 +0200 Subject: [PATCH 1/9] Force font size 9 for the about screen We had this but lost it --- bin/omarchy-menu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omarchy-menu b/bin/omarchy-menu index b4e0a822..f5179cb2 100755 --- a/bin/omarchy-menu +++ b/bin/omarchy-menu @@ -381,7 +381,7 @@ go_to_menu() { *remove*) show_remove_menu ;; *update*) show_update_menu ;; *system*) show_system_menu ;; - *about*) terminal bash -c 'fastfetch; read -n 1 -s' ;; + *about*) alacritty --class Omarchy -o font.size=9 -e bash -c 'fastfetch; read -n 1 -s' ;; esac } From 9a2cdc2bc4d41e1b5f150dfaf97441318fc18233 Mon Sep 17 00:00:00 2001 From: Taha Date: Tue, 26 Aug 2025 06:28:25 -0700 Subject: [PATCH 2/9] Update fastfetch info --- config/fastfetch/config.jsonc | 69 ++++++++++++----------------------- migrations/1756208867.sh | 3 ++ 2 files changed, 27 insertions(+), 45 deletions(-) create mode 100644 migrations/1756208867.sh diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index 18c8cdf9..c7a5739d 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -63,41 +63,14 @@ "format": "\u001b[90m┌──────────────────────Software──────────────────────┐" }, { - "type": "os", - "key": "󰣇 OS", - "keyColor": "yellow" + "type": "command", + "key": "\ue900 OS", + "keyColor": "blue", + "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\"" }, { "type": "kernel", "key": "│ ├", - "keyColor": "yellow" - }, - { - "type": "packages", - "key": "│ ├󰏖", - "keyColor": "yellow" - }, - { - "type": "shell", - "key": "└ └", - "keyColor": "yellow" - }, - "break", - { - "type": "command", - "key": "Ø Omarchy", - "keyColor": "blue", - "text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"$version\"" - }, - { - "type": "command", - "key": "│ ├󰸌", - "keyColor": "blue", - "text": "theme=$(omarchy-theme-current); echo -e \"$theme \\e[38m●\\e[37m●\\e[36m●\\e[35m●\\e[34m●\\e[33m●\\e[32m●\\e[31m●\"" - }, - { - "type": "de", - "key": " DE", "keyColor": "blue" }, { @@ -105,29 +78,35 @@ "key": "│ ├", "keyColor": "blue" }, + { + "type": "de", + "key": " DE", + "keyColor": "blue" + }, + { + "type": "terminal", + "key": "│ ├", + "keyColor": "blue" + }, + { + "type": "packages", + "key": "│ ├󰏖", + "keyColor": "blue" + }, { "type": "wmtheme", "key": "│ ├󰉼", "keyColor": "blue" }, { - "type": "icons", - "key": "│ ├󰀻", - "keyColor": "blue" - }, - { - "type": "cursor", - "key": "│ ├", - "keyColor": "blue" + "type": "command", + "key": "│ ├󰸌", + "keyColor": "blue", + "text": "theme=$(omarchy-theme-current); echo -e \"$theme \\e[38m●\\e[37m●\\e[36m●\\e[35m●\\e[34m●\\e[33m●\\e[32m●\\e[31m●\"" }, { "type": "terminalfont", - "key": "│ ├", - "keyColor": "blue" - }, - { - "type": "terminal", - "key": "└ └", + "key": "└ └", "keyColor": "blue" }, { diff --git a/migrations/1756208867.sh b/migrations/1756208867.sh new file mode 100644 index 00000000..5c351d6b --- /dev/null +++ b/migrations/1756208867.sh @@ -0,0 +1,3 @@ +echo "Update fastfetch config" + +omarchy-refresh-config fastfetch/config.jsonc \ No newline at end of file From a7df6c09414ab548e06772a7b93415e51a9a1e4c Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 10:53:47 +0200 Subject: [PATCH 3/9] Move updatedb into its own config file with better explanation --- install.sh | 7 +------ install/config/localdb.sh | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 install/config/localdb.sh diff --git a/install.sh b/install.sh index 95035bac..794aad43 100755 --- a/install.sh +++ b/install.sh @@ -38,6 +38,7 @@ source $OMARCHY_INSTALL/config/xcompose.sh source $OMARCHY_INSTALL/config/mise-ruby.sh source $OMARCHY_INSTALL/config/docker.sh source $OMARCHY_INSTALL/config/mimetypes.sh +source $OMARCHY_INSTALL/config/localdb.sh source $OMARCHY_INSTALL/config/hardware/network.sh source $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh source $OMARCHY_INSTALL/config/hardware/bluetooth.sh @@ -51,12 +52,6 @@ source $OMARCHY_INSTALL/login/plymouth.sh source $OMARCHY_INSTALL/login/limine-snapper.sh source $OMARCHY_INSTALL/login/alt-bootloaders.sh -# Updates -sudo updatedb - -# Update system packages -sudo pacman -Syu --noconfirm - # Reboot clear tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch diff --git a/install/config/localdb.sh b/install/config/localdb.sh new file mode 100644 index 00000000..73721488 --- /dev/null +++ b/install/config/localdb.sh @@ -0,0 +1,2 @@ +# Update localdb so that locate will find everything installed +sudo updatedb From 742e601bafc2e3bf2397110adc27ce8f6765b459 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 12:06:08 +0200 Subject: [PATCH 4/9] Pinning packages when one goes bad (#1162) * Don't update system packages to prevent issues from something too new at the wrong time * Add system to pin and ignore bad packages To deal with the abseil-cpp issue --- bin/omarchy-pkg-ignored | 7 +++++++ bin/omarchy-pkg-pinned | 7 +++++++ bin/omarchy-update-system-pkgs | 4 ++-- install.sh | 1 + install/packages.ignored | 1 + install/packages.pinned | 1 + install/packaging/pins.sh | 13 +++++++++++++ migrations/1756284863.sh | 3 +++ 8 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 bin/omarchy-pkg-ignored create mode 100755 bin/omarchy-pkg-pinned create mode 100644 install/packages.ignored create mode 100644 install/packages.pinned create mode 100644 install/packaging/pins.sh create mode 100644 migrations/1756284863.sh diff --git a/bin/omarchy-pkg-ignored b/bin/omarchy-pkg-ignored new file mode 100755 index 00000000..765fe69c --- /dev/null +++ b/bin/omarchy-pkg-ignored @@ -0,0 +1,7 @@ +#!/bin/bash + +IGNORED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.ignored" + +if [[ -f $IGNORED_PACKAGES_FILE ]]; then + tr '\r\n' ',' <"$IGNORED_PACKAGES_FILE" | sed 's/,$//' +fi diff --git a/bin/omarchy-pkg-pinned b/bin/omarchy-pkg-pinned new file mode 100755 index 00000000..16d0df19 --- /dev/null +++ b/bin/omarchy-pkg-pinned @@ -0,0 +1,7 @@ +#!/bin/bash + +PINNED_PACKAGES_FILE=$OMARCHY_PATH/install/packages.pinned + +if [[ -f $PINNED_PACKAGES_FILE ]]; then + tr '\r\n' ',' <"$PINNED_PACKAGES_FILE" | sed 's/,$//' +fi diff --git a/bin/omarchy-update-system-pkgs b/bin/omarchy-update-system-pkgs index e3a12fa5..7f01790e 100755 --- a/bin/omarchy-update-system-pkgs +++ b/bin/omarchy-update-system-pkgs @@ -1,8 +1,8 @@ #!/bin/bash echo -e "\e[32m\nUpdate system packages\e[0m" -sudo pacman -Syu --noconfirm -echo +echo "sudo pacman -Syu --noconfirm --ignore \"$(omarchy-pkg-ignored)\"" +sudo pacman -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)" if omarchy-pkg-aur-accessible; then echo -e "\e[32m\nUpdate AUR packages\e[0m" diff --git a/install.sh b/install.sh index 794aad43..00f8786d 100755 --- a/install.sh +++ b/install.sh @@ -22,6 +22,7 @@ source $OMARCHY_INSTALL/packaging/fonts.sh source $OMARCHY_INSTALL/packaging/lazyvim.sh source $OMARCHY_INSTALL/packaging/webapps.sh source $OMARCHY_INSTALL/packaging/tuis.sh +source $OMARCHY_INSTALL/packaging/pins.sh # Configuration source $OMARCHY_INSTALL/config/config.sh diff --git a/install/packages.ignored b/install/packages.ignored new file mode 100644 index 00000000..0b612e32 --- /dev/null +++ b/install/packages.ignored @@ -0,0 +1 @@ +abseil-cpp diff --git a/install/packages.pinned b/install/packages.pinned new file mode 100644 index 00000000..f349af9e --- /dev/null +++ b/install/packages.pinned @@ -0,0 +1 @@ +https://pkgs.omarchy.org/x86_64/abseil-cpp-20250512.1-1-x86_64.pkg.tar.zst diff --git a/install/packaging/pins.sh b/install/packaging/pins.sh new file mode 100644 index 00000000..bacb6165 --- /dev/null +++ b/install/packaging/pins.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +# We pin explicit packages that are bad upstream here +pinned_packages=$(omarchy-pkg-pinned) + +if [[ -n $pinned_packages ]]; then + echo -e "\e[32m\nInstall pinned system packages\e[0m" + + for pinned in $pinned_packages; do + echo "sudo pacman -U --noconfirm $pinned" + sudo pacman -U --noconfirm $pinned + done +fi diff --git a/migrations/1756284863.sh b/migrations/1756284863.sh new file mode 100644 index 00000000..3e1308bd --- /dev/null +++ b/migrations/1756284863.sh @@ -0,0 +1,3 @@ +echo "Pin abseil-cpp as the latest package is broken" + +sudo pacman -U --noconfirm https://archive.archlinux.org/packages/u/uwsm/uwsm-0.23.0-1-any.pkg.tar.zst From a43edcde7d592f2e0132a180393804dad490b1b5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 12:14:03 +0200 Subject: [PATCH 5/9] Quote it --- bin/omarchy-pkg-pinned | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/omarchy-pkg-pinned b/bin/omarchy-pkg-pinned index 16d0df19..503d5c76 100755 --- a/bin/omarchy-pkg-pinned +++ b/bin/omarchy-pkg-pinned @@ -1,6 +1,6 @@ #!/bin/bash -PINNED_PACKAGES_FILE=$OMARCHY_PATH/install/packages.pinned +PINNED_PACKAGES_FILE="$OMARCHY_PATH/install/packages.pinned" if [[ -f $PINNED_PACKAGES_FILE ]]; then tr '\r\n' ',' <"$PINNED_PACKAGES_FILE" | sed 's/,$//' From 4eb2fab33dbb58033dd2e00645b5b8be4ca2e2e7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 12:21:25 +0200 Subject: [PATCH 6/9] Ignore for yay too --- bin/omarchy-update-system-pkgs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/omarchy-update-system-pkgs b/bin/omarchy-update-system-pkgs index 7f01790e..2c41d733 100755 --- a/bin/omarchy-update-system-pkgs +++ b/bin/omarchy-update-system-pkgs @@ -6,7 +6,8 @@ sudo pacman -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)" if omarchy-pkg-aur-accessible; then echo -e "\e[32m\nUpdate AUR packages\e[0m" - yay -Syu --noconfirm + echo "yay -Syu --noconfirm --ignore \"$(omarchy-pkg-ignored)\"" + yay -Syu --noconfirm --ignore "$(omarchy-pkg-ignored)" echo else echo -e "\e[31m\nAUR is unavailable (so skipping updates)\e[0m" From 0f8a94aa50d1593fef7e0943305e2d5e85dc6c39 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 12:26:03 +0200 Subject: [PATCH 7/9] Pin at the end --- install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 00f8786d..1905157c 100755 --- a/install.sh +++ b/install.sh @@ -22,7 +22,6 @@ source $OMARCHY_INSTALL/packaging/fonts.sh source $OMARCHY_INSTALL/packaging/lazyvim.sh source $OMARCHY_INSTALL/packaging/webapps.sh source $OMARCHY_INSTALL/packaging/tuis.sh -source $OMARCHY_INSTALL/packaging/pins.sh # Configuration source $OMARCHY_INSTALL/config/config.sh @@ -53,6 +52,9 @@ source $OMARCHY_INSTALL/login/plymouth.sh source $OMARCHY_INSTALL/login/limine-snapper.sh source $OMARCHY_INSTALL/login/alt-bootloaders.sh +# Pin any bad packages +source $OMARCHY_INSTALL/packaging/pins.sh + # Reboot clear tte -i ~/.local/share/omarchy/logo.txt --frame-rate 920 laseretch From 2b0d2e47514343aa5ad108ec516f885c1077c7ab Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 12:35:48 +0200 Subject: [PATCH 8/9] Should be exe --- install/packaging/pins.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 install/packaging/pins.sh diff --git a/install/packaging/pins.sh b/install/packaging/pins.sh old mode 100644 new mode 100755 From 2294393d711b23a8baaf030c5cd44ad13984e0df Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 27 Aug 2025 12:39:36 +0200 Subject: [PATCH 9/9] Just force it for now --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 1905157c..44e2887c 100755 --- a/install.sh +++ b/install.sh @@ -52,8 +52,8 @@ source $OMARCHY_INSTALL/login/plymouth.sh source $OMARCHY_INSTALL/login/limine-snapper.sh source $OMARCHY_INSTALL/login/alt-bootloaders.sh -# Pin any bad packages -source $OMARCHY_INSTALL/packaging/pins.sh +# Pin bad packages +sudo pacman -U --noconfirm https://pkgs.omarchy.org/x86_64/abseil-cpp-20250512.1-1-x86_64.pkg.tar.zst # Reboot clear