06a3dbca42
* Offer to reboot when toggling sudoless Docker; show only the relevant menu entry Group membership only takes effect on a fresh session, and in practice a logout or newgrp isn't enough — only a reboot reliably applies it. So the setup/remove commands now flag the reboot and offer to do it now with a gum confirm (like the GPU toggle), and the notices say "after a reboot" instead of pointing at logout or newgrp. The existing-user migration passes OMARCHY_DEFER_REBOOT so it does not prompt mid-update — omarchy-update-restart still handles the reboot once the whole update finishes. The Setup > Security menu also showed Sudoless Docker under both Setup and Remove. Condition the Setup entry on the group being absent (Remove already conditions on it being present), so only the applicable one appears. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Gb7x6poap4hGCndPx5qt5T * Ask omarchy-sudo-docker whether Docker needs sudo Every place that chooses between talking to Docker directly and elevating was testing group membership by hand, and the menu guards tested the wrong thing: they read the running session's groups, which do not change until the reboot, so after enabling sudoless Docker the menu still offered Setup — the one action that could no longer do anything — while Remove stayed hidden. Add omarchy-sudo-docker as the single answer, with the two questions that actually differ in that window. By default it asks whether this session can reach the socket, which is what decides if a command must elevate: lazydocker and the Windows VM keep prompting until the reboot lands. With --configured it asks whether the account is set up for sudoless Docker, which is what the menu and the toggles need, so the menu switches to the action that can change state as soon as the group is written. Also correct a comment: nothing surfaces reboot-required in the bar; it is omarchy-update-restart that reads it during a later update. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Gb7x6poap4hGCndPx5qt5T --------- Co-authored-by: David Heinemeier Hansson <david@hey.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
23 lines
1.2 KiB
Bash
23 lines
1.2 KiB
Bash
echo "Move this install to the opt-in docker group default (the group is root-equivalent)"
|
|
|
|
# The docker group grants passwordless root (a container can bind-mount / and
|
|
# rewrite the host), so Omarchy no longer puts users in it by default. Bring
|
|
# existing installs in line: remove this user from the group if present. The
|
|
# change applies after a reboot, so it stays reachable until then. Anyone who
|
|
# wants passwordless docker back can opt in, behind a warning, with
|
|
# Setup > Security > Sudoless Docker. Reuses the removal command so there is one
|
|
# source of truth for the privileged change and its notice; DEFER_REBOOT keeps
|
|
# it from prompting mid-update — omarchy-update-restart handles the reboot once
|
|
# the whole update has finished.
|
|
if id -nG "$USER" | grep -qw docker; then
|
|
OMARCHY_DEFER_REBOOT=1 omarchy-remove-security-sudoless-docker
|
|
fi
|
|
|
|
# The Docker app entry copied into ~/.local/share/applications used to run
|
|
# lazydocker directly; it now needs the wrapper that prompts for daemon access
|
|
# (or runs directly under sudoless Docker). Refresh just that file.
|
|
dest="$HOME/.local/share/applications/Docker.desktop"
|
|
if [[ -f $dest ]]; then
|
|
cp "$OMARCHY_PATH/applications/Docker.desktop" "$dest"
|
|
fi
|