Merge branch 'quattro' into unified-input-method-setup

install/user/all.sh

@@ -14,3 +14,6 @@ run_logged "$OMARCHY_INSTALL/user/hardware/vm-no-animations.sh"
 
 run_logged "$OMARCHY_INSTALL/user/default-keyring.sh"
 run_logged "$OMARCHY_INSTALL/user/mise.sh"
+run_logged "$OMARCHY_INSTALL/user/dictation-default.sh"
+
+run_logged "$OMARCHY_INSTALL/user/platform-setup.sh"

install/user/dictation-default.sh

@@ -0,0 +1,8 @@
+# The settings package presets Superwhisper as the dictation backend, and it has
+# no aarch64 build. A new user there starts with no backend selected and picks
+# one in Setup > Defaults > Dictation. Any other selection is left alone.
+dictation_default="${XDG_CONFIG_HOME:-$HOME/.config}/omarchy/defaults/dictation"
+if ! omarchy-hw-x86 && omarchy-cmd-missing superwhisper &&
+  [[ -f $dictation_default && $(<"$dictation_default") == "superwhisper" ]]; then
+  rm -f "$dictation_default"
+fi

install/user/first-run/enable-user-units.sh

@@ -14,13 +14,22 @@ set -euo pipefail
 omarchy-input-method configure --defaults || echo "Input method defaults deferred; run omarchy setup input after login." >&2
 
 systemctl --user daemon-reload
-systemctl --user enable --now \
+
+# One at a time: given a list, systemctl enables none of it when it cannot find
+# one unit, and that should not cost the session its bluetooth agent as well.
+failed=0
+for unit in \
   bt-agent.service \
   owed.service \
   omarchy-recover-internal-monitor.service \
   omarchy-sleep-lock.service \
   omarchy-migrate-notify.service \
   omarchy-fcitx5.service \
-  omarchy-crash-watch.service
+  omarchy-crash-watch.service \
+  omarchy-usb-authorization.service \
+  omarchy-thunderbolt-authorization.service; do
+  systemctl --user enable --now "$unit" || failed=1
+done
 
 omarchy-hook-install theme-set /usr/share/owe/10-owe-sync
+exit "$failed"

install/user/platform-setup.sh

@@ -0,0 +1,10 @@
+# The platform package's own setup for this user, last so it builds on every
+# other leaf (omarchy-lifecycle-dispatch setup-user, see
+# docs/lifecycle-dispatch.md). A no-op where the platform registers none. In an
+# image build the detector would read the build host, so it waits for first run
+# on the machine, which runs it again.
+if [[ -e ${OMARCHY_IMAGE_ROOT:-}/var/lib/omarchy/image/target ]]; then
+  echo "Image build: the platform's user setup waits for first run on the machine"
+else
+  omarchy-lifecycle-dispatch setup-user
+fi