From f901d36290b4fbb088b427034f44da23ab2713fb Mon Sep 17 00:00:00 2001 From: W4HO <87742609+W4HO-ham@users.noreply.github.com> Date: Mon, 2 Nov 2026 11:34:04 -0647 Subject: [PATCH] omamobile-shell 0.2.98: the user setup makes Omarchy's default keyring Omarchy's installer gives each user an unlocked default keyring, but a phone user is made without that installer, so on the Pixel 9a Chromium's first start opened an oversized "Choose password for new keyring" prompt that the palmtop couldn't get past. The user setup now runs Omarchy's own default-keyring step, which creates only what is missing. The step is an if-block, so the script still succeeds when a later Omarchy moves the file, with a test for that. --- .../omamobile-shell/bin/omamobile-setup-user | 10 +++++++++ packages/omamobile-shell/test/setup-user.sh | 21 +++++++++++++++++++ packages/omamobile-shell/version | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/packages/omamobile-shell/bin/omamobile-setup-user b/packages/omamobile-shell/bin/omamobile-setup-user index 741315172..d17ee6898 100755 --- a/packages/omamobile-shell/bin/omamobile-setup-user +++ b/packages/omamobile-shell/bin/omamobile-setup-user @@ -624,3 +624,13 @@ if omarchy-done ensure omamobile-lock-after-screensaver; then mkdir -p ~/.local/state/omarchy/toggles touch ~/.local/state/omarchy/toggles/lock-after-screensaver fi + +# Omarchy's installer gives each user an unencrypted default keyring (no +# password, never locked) +# (install/user/default-keyring.sh), so apps that keep secrets, Chromium +# among them, don't ask for a keyring password that the phone's autologin +# never types (on the Pixel 9a, Chromium's first start opened a "Choose +# password for new keyring" prompt). A phone user is made without that +# installer, so run Omarchy's own script: it creates only what is missing. +keyring=${OMARCHY_PATH:-/usr/share/omarchy}/install/user/default-keyring.sh +if [[ -f $keyring ]]; then bash "$keyring"; fi diff --git a/packages/omamobile-shell/test/setup-user.sh b/packages/omamobile-shell/test/setup-user.sh index 98bd44f1a..f3d7748bb 100644 --- a/packages/omamobile-shell/test/setup-user.sh +++ b/packages/omamobile-shell/test/setup-user.sh @@ -53,6 +53,12 @@ printf '[Desktop Entry]\nType=Application\nName=Papers\nExec=papers\n' >"$A/org. for b in gs201-cheetah:gs201 zumapro-tegu:zumapro; do mkdir -p "$t/dt-${b%%:*}"; printf 'google,%s\0google,%s\0' "${b%%:*}" "${b#*:}" >"$t/dt-${b%%:*}/compatible" done +# Omarchy's default-keyring step, as Omarchy ships it (only what's missing) +mkdir -p "$t/omarchy/install/user" +cat >"$t/omarchy/install/user/default-keyring.sh" <<'KR' +d="$HOME/.local/share/keyrings"; mkdir -p "$d" +[[ -f $d/default ]] || echo Default_keyring >"$d/default" +KR run() { env -i HOME="${RUN_HOME:-$H}" PATH="$F:/usr/bin:/bin" XDG_RUNTIME_DIR="$t" OMAMOBILE_SHELL_SHARE="$pkg" OMAMOBILE_SYSTEM_APPLICATIONS="$A" \ OMAMOBILE_DT="${RUN_DT:-$t/dt-gs201-cheetah}" OMAMOBILE_SQUEEKBOARD_SHARE="$pkg/squeekboard/keyboards" \ @@ -403,3 +409,18 @@ RUN_HOME=$hn GSETTINGS_NO_CLICK_POLICY=1 run grep -q '^gsettings set org.gnome.nautilus.preferences' "$hn/calls" && fail "nothing is set on a Nautilus without click-policy" [[ ! -e $hn/.local/state/omarchy/done/omamobile-files-single-tap ]] || fail "the step isn't marked done when the key is missing" pass "Files: one tap opens a folder, set once, skipped on a Nautilus without the key" + +# The default keyring: Omarchy's own step runs, and a user's keyring is kept +hk=$t/keyring; mkdir -p "$hk/.config/hypr"; cp "$H"/.config/hypr/*.lua "$hk/.config/hypr/" +RUN_HOME=$hk run +[[ $(cat "$hk/.local/share/keyrings/default" 2>/dev/null) == Default_keyring ]] || fail "a new user gets Omarchy's default keyring" +echo mine >"$hk/.local/share/keyrings/default" +RUN_HOME=$hk run +[[ $(cat "$hk/.local/share/keyrings/default") == mine ]] || fail "a user's own default keyring is kept" +pass "the default keyring: Omarchy's step runs, and a user's own keyring is kept" + +# Without Omarchy's step (a later Omarchy may move it), the setup still succeeds +he=$t/no-keyring-step; mkdir -p "$he/.config/hypr" "$t/empty-omarchy"; cp "$H"/.config/hypr/*.lua "$he/.config/hypr/" +RUN_HOME=$he RUN_OMARCHY_PATH=$t/empty-omarchy run +[[ ! -e $he/.local/share/keyrings/default ]] || fail "no keyring is made without Omarchy's step" +pass "without Omarchy's keyring step the setup still succeeds" diff --git a/packages/omamobile-shell/version b/packages/omamobile-shell/version index 832560a97..c2f0a830c 100644 --- a/packages/omamobile-shell/version +++ b/packages/omamobile-shell/version @@ -1 +1 @@ -0.2.97 +0.2.98