Merge pull request #1568 from basecamp/dev

Omarchy 3.0

bin/omarchy-install-chromium-google-account

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ -f ~/.config/chromium-flags.conf ]]; then
+  CONF=~/.config/chromium-flags.conf
+
+  grep -qxF -- "--oauth2-client-id=77185425430.apps.googleusercontent.com" "$CONF" ||
+    echo "--oauth2-client-id=77185425430.apps.googleusercontent.com" >>"$CONF"
+
+  grep -qxF -- "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" "$CONF" ||
+    echo "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" >>"$CONF"
+
+  echo "Now you can login to your Google Account in Chromium."
+fi

bin/omarchy-menu

@@ -249,10 +249,11 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden") in
+  case $(menu "Install" "  Dropbox\n  Tailscale\n󰟵  Bitwarden\n  Chromium Account") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
   *Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
+  *Chromium*) present_terminal omarchy-install-chromium-google-account ;;
   *) show_install_menu ;;
   esac
 }

bin/omarchy-theme-set-terminal

@@ -3,12 +3,5 @@
 case "$TERMINAL" in
 "alacritty") touch ~/.config/alacritty/alacritty.toml ;;
 "kitty") killall -SIGUSR1 kitty ;;
-"ghostty")
+"ghostty") killall -SIGUSR2 ghostty ;;
-  # Use a default theme if none exists
-  if [[ ! -f ~/.config/omarchy/current/theme/ghostty.conf ]]; then
-    echo "theme = Spacegray" >~/.config/omarchy/current/theme/ghostty.conf
-  fi
-
-  killall -USRSIG2 ghostty
-  ;;
 esac

config/chromium-flags.conf

@@ -2,5 +2,3 @@
 --ozone-platform-hint=wayland
 --enable-features=TouchpadOverscrollHistoryNavigation
 --load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
---oauth2-client-id=77185425430.apps.googleusercontent.com
---oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT

config/ghostty/config

@@ -1,5 +1,5 @@
 # Dynamic theme colors
-config-file = "~/.config/omarchy/current/theme/ghostty.conf"
+config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
 
 # Font
 font-family = "CaskaydiaMono Nerd Font"

default/brave/policies/managed/onepassword.json

@@ -1,8 +0,0 @@
-{
-  "ExtensionInstallForcelist": [
-    "aeblfdkhhhdcdjpifhhbdiojplfjncoa;https://clients2.google.com/service/update2/crx"
-  ],
-  "ExtensionInstallAllowlist": [
-    "aeblfdkhhhdcdjpifhhbdiojplfjncoa"
-  ]
-}

default/chromium/policies/managed/onepassword.json

@@ -1,8 +0,0 @@
-{
-  "ExtensionInstallForcelist": [
-    "aeblfdkhhhdcdjpifhhbdiojplfjncoa;https://clients2.google.com/service/update2/crx"
-  ],
-  "ExtensionInstallAllowlist": [
-    "aeblfdkhhhdcdjpifhhbdiojplfjncoa"
-  ]
-}

install/config/all.sh

@@ -15,7 +15,6 @@ run_logged $OMARCHY_INSTALL/config/docker.sh
 run_logged $OMARCHY_INSTALL/config/mimetypes.sh
 run_logged $OMARCHY_INSTALL/config/localdb.sh
 run_logged $OMARCHY_INSTALL/config/sudoless-asdcontrol.sh
-run_logged $OMARCHY_INSTALL/config/browser-policies.sh
 run_logged $OMARCHY_INSTALL/config/hardware/network.sh
 run_logged $OMARCHY_INSTALL/config/hardware/set-wireless-regdom.sh
 run_logged $OMARCHY_INSTALL/config/hardware/fix-fkeys.sh

install/config/browser-policies.sh

@@ -1,9 +0,0 @@
-# Add 1password extension to Chromium
-sudo mkdir -p /etc/chromium/policies/managed/
-sudo cp $OMARCHY_PATH/default/chromium/policies/managed/onepassword.json /etc/chromium/policies/managed/onepassword.json
-sudo chmod 644 /etc/chromium/policies/managed/onepassword.json
-
-# Add 1password extension to future Brave installs
-sudo mkdir -p /etc/brave/policies/managed/
-sudo cp $OMARCHY_PATH/default/brave/policies/managed/onepassword.json /etc/brave/policies/managed/onepassword.json
-sudo chmod 644 /etc/brave/policies/managed/onepassword.json

install/first-run/welcome.sh

@@ -1,2 +1,2 @@
-notify-send "    Update System" "When you have internet, click to update the system." -t 30000
+notify-send "    Update System" "When you have internet, click to update the system." -u critical
 notify-send "👋  Welcome to Omarchy" "You're in for a great computing adventure. Have fun!" -t 30000

install/omarchy-base.packages

@@ -31,7 +31,6 @@ fd
 ffmpegthumbnailer
 fontconfig
 fzf
-gcc14
 github-cli
 gnome-calculator
 gnome-keyring

migrations/1757871769.sh

@@ -1,3 +0,0 @@
-echo "Refresh chromium-flags.conf to add option of logging in to Google account for settings sync"
-
-omarchy-refresh-config chromium-flags.conf