From 659340334506c0a76f2bb26d93d3573495e72abc Mon Sep 17 00:00:00 2001
From: Kushida <kushidashiro@gmail.com>
Date: Thu, 30 Jul 2026 00:15:27 +0300
Subject: [PATCH] fix: fall back to XDG MIME browser handler (#6424)

---
 bin/omarchy-launch-browser          |  3 +++
 test/shell.d/launch-browser-test.sh | 25 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/bin/omarchy-launch-browser b/bin/omarchy-launch-browser
index 8f365bd2..044b220d 100755
--- a/bin/omarchy-launch-browser
+++ b/bin/omarchy-launch-browser
@@ -4,6 +4,9 @@
 # omarchy:args=[url]
 
 default_browser=$(env -u BROWSER xdg-settings get default-web-browser)
+if [[ -z $default_browser ]]; then
+  default_browser=$(xdg-mime query default x-scheme-handler/https)
+fi
 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/test/shell.d/launch-browser-test.sh b/test/shell.d/launch-browser-test.sh
index 14908f1c..161ff9ee 100644
--- a/test/shell.d/launch-browser-test.sh
+++ b/test/shell.d/launch-browser-test.sh
@@ -18,7 +18,14 @@ EOF
 
 cat >"$mock_bin/xdg-settings" <<'SH'
 #!/bin/bash
-echo chromium.desktop
+[[ -z ${BROWSER:-} ]] || printf '%s\n' "$BROWSER" >"$OMARCHY_TEST_XDG_SETTINGS_BROWSER"
+[[ ${OMARCHY_TEST_XDG_SETTINGS_EMPTY:-0} == "1" ]] || echo chromium.desktop
+SH
+cat >"$mock_bin/xdg-mime" <<'SH'
+#!/bin/bash
+if [[ $* == "query default x-scheme-handler/https" ]]; then
+  echo chromium.desktop
+fi
 SH
 cat >"$mock_bin/chromium" <<'SH'
 #!/bin/bash
@@ -36,6 +43,7 @@ chmod +x "$mock_bin"/*
 
 launch_log="$test_tmp/launch"
 focus_log="$test_tmp/focus"
+xdg_settings_browser="$test_tmp/xdg-settings-browser"
 HOME="$test_home" PATH="$mock_bin:$PATH" HYPRLAND_INSTANCE_SIGNATURE=test \
   OMARCHY_TEST_BROWSER_LAUNCH="$launch_log" OMARCHY_TEST_BROWSER_FOCUS="$focus_log" \
   bash "$ROOT/bin/omarchy-launch-browser"
@@ -55,4 +63,19 @@ HOME="$test_home" PATH="$mock_bin:$PATH" HYPRLAND_INSTANCE_SIGNATURE=test \
 grep -F 'https://example.test/authorize' "$launch_log" >/dev/null || fail "browser launcher passes through the URL"
 grep -Fx '^chromium.*$' "$focus_log" >/dev/null || fail "browser launcher focuses the default browser window"
 
+rm -f "$focus_log" "$xdg_settings_browser"
+
+HOME="$test_home" PATH="$mock_bin:$PATH" HYPRLAND_INSTANCE_SIGNATURE=test \
+  BROWSER=omarchy-launch-browser OMARCHY_TEST_XDG_SETTINGS_EMPTY=1 \
+  OMARCHY_TEST_BROWSER_LAUNCH="$launch_log" OMARCHY_TEST_BROWSER_FOCUS="$focus_log" \
+  OMARCHY_TEST_XDG_SETTINGS_BROWSER="$xdg_settings_browser" \
+  bash "$ROOT/bin/omarchy-launch-browser" "https://example.test/fallback"
+
+grep -F 'https://example.test/fallback' "$launch_log" >/dev/null ||
+  fail "browser launcher falls back to the HTTPS handler when xdg-settings is empty"
+[[ ! -e $xdg_settings_browser ]] ||
+  fail "browser launcher unsets BROWSER before reading xdg-settings"
+grep -Fx '^chromium.*$' "$focus_log" >/dev/null ||
+  fail "browser launcher focuses the browser resolved from the HTTPS handler"
+
 pass "browser launcher follows opened links to the browser workspace"