From e61ff1ef4fa5170218b50237f4c12f601d728841 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 24 Jul 2026 09:01:17 -0700 Subject: [PATCH] Unset BROWSER for xdg-settings reads and don't abort removal on fallback failure xdg-settings get also consults $BROWSER, so unset it for the getters too. A failed best-effort fallback default should not abort the browser removal. Co-Authored-By: Claude Fable 5 --- bin/omarchy-default-browser | 4 ++-- bin/omarchy-launch-browser | 2 +- bin/omarchy-remove-browser | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/omarchy-default-browser b/bin/omarchy-default-browser index 32aaf950..f53ccf9a 100755 --- a/bin/omarchy-default-browser +++ b/bin/omarchy-default-browser @@ -5,7 +5,7 @@ # omarchy:examples=omarchy default browser firefox | omarchy default browser brave if (($# == 0)); then - case "$(xdg-settings get default-web-browser)" in + case "$(env -u BROWSER xdg-settings get default-web-browser)" in chromium.desktop) echo "chromium" ;; google-chrome.desktop) echo "chrome" ;; brave-browser.desktop) echo "brave" ;; @@ -13,7 +13,7 @@ if (($# == 0)); then microsoft-edge.desktop) echo "edge" ;; firefox.desktop) echo "firefox" ;; zen.desktop) echo "zen" ;; - *) xdg-settings get default-web-browser ;; + *) env -u BROWSER xdg-settings get default-web-browser ;; esac exit 0 fi diff --git a/bin/omarchy-launch-browser b/bin/omarchy-launch-browser index 567cffad..8f365bd2 100755 --- a/bin/omarchy-launch-browser +++ b/bin/omarchy-launch-browser @@ -3,7 +3,7 @@ # omarchy:summary=Launch the default browser as determined by xdg-settings. # omarchy:args=[url] -default_browser=$(xdg-settings get default-web-browser) +default_browser=$(env -u BROWSER xdg-settings get default-web-browser) browser_exec=$(sed -n 's/^Exec=\([^ ]*\).*/\1/p' {~/.local,~/.nix-profile,/usr}/share/applications/$default_browser 2>/dev/null | head -1) if $browser_exec --help 2>/dev/null | grep -q MOZ_LOG; then diff --git a/bin/omarchy-remove-browser b/bin/omarchy-remove-browser index 6818fbc1..02fb6246 100755 --- a/bin/omarchy-remove-browser +++ b/bin/omarchy-remove-browser @@ -7,14 +7,14 @@ set_fallback_default_browser() { local current_browser - current_browser=$(xdg-settings get default-web-browser) + current_browser=$(env -u BROWSER xdg-settings get default-web-browser) if [[ $current_browser != $1 ]]; then return fi if omarchy-cmd-present chromium; then - env -u BROWSER xdg-settings set default-web-browser chromium.desktop || exit 1 + env -u BROWSER xdg-settings set default-web-browser chromium.desktop || true fi }