diff --git a/install/apps/aur.sh b/install/apps/aur.sh index 1dca09a7..b355b562 100644 --- a/install/apps/aur.sh +++ b/install/apps/aur.sh @@ -10,11 +10,6 @@ if omarchy-pkg-aur-accessible; then yay -S --noconfirm --needed \ tzupdate wl-screenrec \ python-poetry-core python-terminaltexteffects - - # We install chromium to be safe that we have a browser, - # but replace it with our version if AUR is available - sudo pacman -Rns chromium - yay -S --noconfirm omarchy-chromium-bin else echo -e "\n\e[31mAUR is unavailable. Skipping installation of: 1password, Typora, tte, tzupdate !\e[0m" echo "You will have to install these later when AUR is available." diff --git a/install/desktop/desktop.sh b/install/desktop/desktop.sh index affa96c6..e1226c5c 100644 --- a/install/desktop/desktop.sh +++ b/install/desktop/desktop.sh @@ -6,5 +6,4 @@ sudo pacman -S --noconfirm --needed \ nautilus sushi ffmpegthumbnailer gvfs-mtp \ slurp satty wf-recorder \ mpv evince imv \ - walker-bin \ - chromium + walker-bin omarchy-chromium diff --git a/migrations/1755164105.sh b/migrations/1755164105.sh index 807982bd..0ac7ac2b 100644 --- a/migrations/1755164105.sh +++ b/migrations/1755164105.sh @@ -1,28 +1,24 @@ echo "Switch to Omarchy Chromium for synchronized theme switching" -if omarchy-pkg-aur-accessible; then - set_theme_colors() { - if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then - chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)" - else - # Use a default, neutral grey if theme doesn't have a color - chromium --no-startup-window --set-theme-color="28,32,39" - fi - } +set_theme_colors() { + if [[ -f ~/.config/omarchy/current/theme/chromium.theme ]] && command -v chromium &>/dev/null; then + chromium --no-startup-window --set-theme-color="$(<~/.config/omarchy/current/theme/chromium.theme)" + else + # Use a default, neutral grey if theme doesn't have a color + chromium --no-startup-window --set-theme-color="28,32,39" + fi +} - if command -v chromium &>/dev/null; then - sudo pacman -Rns --noconfirm chromium || true - yay -Sy --noconfirm omarchy-chromium-bin +if command -v chromium &>/dev/null; then + sudo pacman -Rns --noconfirm chromium || true + yay -Sy --noconfirm omarchy-chromium - if pgrep -x chromium; then - if gum confirm "Chromium must be restarted. Ready?"; then - pkill -x chromium - set_theme_colors - fi - else + if pgrep -x chromium; then + if gum confirm "Chromium must be restarted. Ready?"; then + pkill -x chromium set_theme_colors fi + else + set_theme_colors fi -else - echo -e "\n\e[31mAUR is unavailable. Skipping installation. Please try manually later.\e[0m" fi