mirror of
https://github.com/arthur-pbty/arthur-os.git
synced 2026-08-06 12:39:35 +02:00
Ryan Hughes
0e91948b8f
The /etc/profile.d/omarchy.sh default for OMARCHY_PATH was being clobbered
by shipped config files that re-export the variable to the old script-mode
path. In package mode, every login shell, UWSM session, and Hyprland
autostart was effectively reversing the migration. Fix:
- default/bashrc: source from $OMARCHY_PATH/default/bash/rc; default
OMARCHY_PATH to /usr/share/omarchy if not set (so the source line
works in any boot order, including non-login interactive shells).
- default/bash/envs: change 'export OMARCHY_PATH=$HOME/...' to
'export OMARCHY_PATH=${OMARCHY_PATH:-/usr/share/omarchy}' so the
profile.d default and install.sh script-mode override both win.
- config/uwsm/env: same defaulting pattern. UWSM may not source
profile.d, so the inline default still matters.
- default/hypr/autostart.lua: quickshell launched from $OMARCHY_PATH/shell
(not literal $HOME path). The bash that runs hl.exec_cmd sees
OMARCHY_PATH propagated from UWSM env.
- config/chromium-flags.conf: --load-extension hard-codes
/usr/share/omarchy/... because chromium doesn't expand env vars or
'~'. The omarchy-dev-link workflow symlinks /usr/share/omarchy to a
checkout.
- bin/omarchy-install-browser: same chromium-flag path correction for
brave-origin-beta-flags.conf.
96 lines
2.7 KiB
Bash
Executable File
96 lines
2.7 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Install a supported browser
|
|
# omarchy:args=<chrome|brave|brave-origin|edge|firefox|zen>
|
|
# omarchy:examples=omarchy install browser firefox | omarchy install browser brave
|
|
|
|
setup_policy_directory() {
|
|
sudo mkdir -p "$1"
|
|
sudo chmod a+rw "$1"
|
|
}
|
|
|
|
announce_browser_installed() {
|
|
echo ""
|
|
echo "$1 browser installed. Make it the default via Setup > Defaults > Browser."
|
|
}
|
|
|
|
copy_chromium_flags() {
|
|
mkdir -p ~/.config
|
|
cp -f "$OMARCHY_PATH/config/chromium-flags.conf" "$1"
|
|
omarchy-install-chromium-ytdlp
|
|
}
|
|
|
|
setup_firefox_preferences() {
|
|
local distribution_dir="$1"
|
|
|
|
setup_policy_directory "$distribution_dir"
|
|
sudo cp -f "$OMARCHY_PATH/default/firefox/policies.json" "$distribution_dir/policies.json"
|
|
}
|
|
|
|
setup_firefox_wayland() {
|
|
mkdir -p ~/.config/environment.d
|
|
echo "MOZ_ENABLE_WAYLAND=1" > ~/.config/environment.d/omarchy-firefox-wayland.conf
|
|
}
|
|
|
|
case $1 in
|
|
chrome)
|
|
echo "Installing Chrome..."
|
|
omarchy-pkg-aur-add google-chrome || exit 1
|
|
|
|
setup_policy_directory /etc/opt/chrome/policies/managed
|
|
copy_chromium_flags ~/.config/chrome-flags.conf
|
|
omarchy-theme-set-browser
|
|
announce_browser_installed "Chrome"
|
|
;;
|
|
edge)
|
|
echo "Installing Edge..."
|
|
omarchy-pkg-aur-add microsoft-edge-stable-bin || exit 1
|
|
|
|
setup_policy_directory /etc/opt/edge/policies/managed
|
|
copy_chromium_flags ~/.config/microsoft-edge-stable-flags.conf
|
|
omarchy-theme-set-browser
|
|
announce_browser_installed "Edge"
|
|
;;
|
|
brave)
|
|
echo "Installing Brave..."
|
|
omarchy-pkg-aur-add brave-bin || exit 1
|
|
|
|
setup_policy_directory /etc/brave/policies/managed
|
|
copy_chromium_flags ~/.config/brave-flags.conf
|
|
omarchy-theme-set-browser
|
|
announce_browser_installed "Brave"
|
|
;;
|
|
brave-origin)
|
|
echo "Installing Brave Origin..."
|
|
omarchy-pkg-aur-add brave-origin-beta-bin || exit 1
|
|
|
|
setup_policy_directory /etc/brave/policies/managed
|
|
mkdir -p ~/.config
|
|
# FIXME: Use normal chromium flags when Brave Origin wrapper has been fixed
|
|
echo "--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp" > ~/.config/brave-origin-beta-flags.conf
|
|
omarchy-install-chromium-ytdlp
|
|
omarchy-theme-set-browser
|
|
announce_browser_installed "Brave Origin"
|
|
;;
|
|
firefox)
|
|
echo "Installing Firefox..."
|
|
omarchy-pkg-add firefox || exit 1
|
|
|
|
setup_firefox_preferences /usr/lib/firefox/distribution
|
|
setup_firefox_wayland
|
|
announce_browser_installed "Firefox"
|
|
;;
|
|
zen)
|
|
echo "Installing Zen..."
|
|
omarchy-pkg-aur-add zen-browser-bin || exit 1
|
|
|
|
setup_firefox_preferences /opt/zen-browser/distribution
|
|
setup_firefox_wayland
|
|
announce_browser_installed "Zen"
|
|
;;
|
|
*)
|
|
echo "Usage: omarchy-install-browser <chrome|brave|brave-origin|edge|firefox|zen>"
|
|
exit 1
|
|
;;
|
|
esac
|