* Replace Gemini coding agent with Antigravity * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Remove the dead Gemini mise wrapper in the Antigravity migration Remove Preinstalls no longer lists gemini, so the wrapper Omarchy created would have stayed in ~/.local/bin with nothing left to clean it up. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Install Antigravity when it is the default a Gemini user is migrated onto The opt-out check skipped the install but the rewrite ran anyway, so anyone who had removed the preinstalls was left with a default agent naming a command that is not there. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Fix Antigravity skill provisioning and Gemini wrapper migration - Wires Omarchy's default skills into Antigravity by linking them to ~/.gemini/config/skills/ in bin/omarchy-provision-user and migrations/1786719479.sh. - Fixes the Gemini wrapper migration in migrations/1786719479.sh to recognize and remove wrappers containing either `mise use -g "gemini"` or `mise use -g --quiet "gemini"`, while leaving hand-written wrappers intact. - Adds regression tests for both skill provisioning and wrapper removal in test/shell.d/default-agent-test.sh and test/shell.d/provision-user-test.sh. * Stop the provisioning test from retheming the session it runs in The test ran the real omarchy-provision-user, which sources install/user/all.sh and so reached omarchy-theme-set: hyprctl reload against the live compositor, gsettings against the live desktop, and a global Node install, none of which the skill symlinks it asserts need. Its mocks for omarchy-done and omarchy-refresh-applications were shadowed anyway, because provisioning prepends $OMARCHY_PATH/bin ahead of them, so stubbing the install suite at its own path is what a mock cannot do here. The exit status is checked rather than discarded: the assertion held even when provisioning died outright, because the symlinks are made twenty lines before the suite runs. * Match the Gemini default and wrapper the way Omarchy writes them The migration decided both questions differently from the code that owns them. It read the default agent with grep -qxF, while omarchy-default-agent takes the first line through read, so a padded " gemini " that the launcher still resolves was left naming an agent the launcher no longer supports. The wrapper it deletes was matched anywhere in the file, so a hand-written one that only mentions the installer's line in a comment went with Omarchy's own. Reading it the launcher's way and anchoring the match settles both against whoever wrote the file. The skills loop guards its glob the way migrations/1786539345.sh does, so an empty source cannot leave a symlink named "*" behind a migration already marked complete. Co-Authored-By: Codex XHigh <noreply@anthropic.com> * List Antigravity among the skill directories The manual named Claude Code, Codex, Pi and the generic location; provisioning now links ~/.gemini/config/skills too. Co-Authored-By: Codex XHigh <noreply@anthropic.com> --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> Co-authored-by: David Heinemeier Hansson <david@hey.com> Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com> Co-authored-by: Omabot <omabot@omarchy.org>
124 lines
3.6 KiB
Bash
Executable File
124 lines
3.6 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Finalize Omarchy user setup (runtime tweaks /etc/skel can't do)
|
|
# omarchy:hidden=true
|
|
|
|
set -euo pipefail
|
|
|
|
usage() {
|
|
cat <<USAGE
|
|
Usage: omarchy finalize user [--force] [--first-install]
|
|
|
|
Runs the per-user setup steps that /etc/skel can't seed:
|
|
dev-aware skill symlinks, xdg-user-dirs + gtk bookmarks (need \$HOME),
|
|
default browser/mailto, and install/user/all.sh.
|
|
|
|
For shipped configs see /etc/skel (new users) and omarchy-reinstall-configs
|
|
(existing users explicitly resyncing).
|
|
|
|
--first-install is used by the ISO in the target chroot. It marks shipped
|
|
migrations complete for the freshly-created user.
|
|
|
|
Idempotency marker: ~/.local/state/omarchy/done/finalize-user
|
|
USAGE
|
|
}
|
|
|
|
if (( EUID == 0 )); then
|
|
echo "Error: run omarchy-provision-user as the user being configured, not as root." >&2
|
|
exit 1
|
|
fi
|
|
|
|
force=0
|
|
first_install=0
|
|
while (($#)); do
|
|
case "$1" in
|
|
--force)
|
|
force=1
|
|
shift
|
|
;;
|
|
--first-install)
|
|
first_install=1
|
|
force=1
|
|
shift
|
|
;;
|
|
-h|--help)
|
|
usage
|
|
exit 0
|
|
;;
|
|
*)
|
|
echo "Unknown option: $1" >&2
|
|
usage >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
done
|
|
|
|
state_dir="$HOME/.local/state/omarchy"
|
|
mkdir -p "$state_dir"
|
|
|
|
if omarchy-done check finalize-user && (( force == 0 )); then
|
|
echo "User finalization already complete (rerun with --force to refresh)."
|
|
exit 0
|
|
fi
|
|
|
|
export OMARCHY_PATH="${OMARCHY_PATH:-/usr/share/omarchy}"
|
|
export OMARCHY_INSTALL="${OMARCHY_INSTALL:-$OMARCHY_PATH/install}"
|
|
export OMARCHY_SETUP_CONTEXT="${OMARCHY_SETUP_CONTEXT:-runtime}"
|
|
export PATH="$OMARCHY_PATH/bin:$PATH"
|
|
|
|
if (( first_install )) && [[ $OMARCHY_SETUP_CONTEXT == "runtime" ]]; then
|
|
# The ISO chroot doesn't set a context; omarchy-provision-owner runs first-install
|
|
# finalization too but with OMARCHY_SETUP_CONTEXT=provision-owner already set.
|
|
export OMARCHY_SETUP_CONTEXT=iso-chroot
|
|
fi
|
|
|
|
if [[ -n ${OMARCHY_INSTALL_LOG_FILE:-} && -f $OMARCHY_INSTALL/helpers/logging.sh ]]; then
|
|
source "$OMARCHY_INSTALL/helpers/logging.sh"
|
|
else
|
|
run_logged() {
|
|
local script="$1"
|
|
bash -eE -c 'source "$1"' bash "$script"
|
|
}
|
|
fi
|
|
|
|
# Dev-aware skill symlinks. Cannot live in /etc/skel because OMARCHY_PATH may
|
|
# point at a dev checkout (omarchy dev link) where the target differs.
|
|
# Loops every skill directory, so shipping a new one needs no edit here.
|
|
mkdir -p ~/.agents/skills ~/.claude/skills ~/.codex/skills ~/.pi/agent/skills ~/.gemini/config/skills
|
|
for skill in "$OMARCHY_PATH"/default/agents/skills/*/; do
|
|
skill=${skill%/}
|
|
name=${skill##*/}
|
|
ln -sfn "$skill" ~/.agents/skills/"$name"
|
|
ln -sfn "$skill" ~/.claude/skills/"$name"
|
|
ln -sfn "$skill" ~/.codex/skills/"$name"
|
|
ln -sfn "$skill" ~/.pi/agent/skills/"$name"
|
|
ln -sfn "$skill" ~/.gemini/config/skills/"$name"
|
|
done
|
|
|
|
mkdir -p ~/Downloads ~/Pictures ~/Videos ~/.config/gtk-3.0
|
|
xdg-user-dirs-update --set TEMPLATES "$HOME"
|
|
xdg-user-dirs-update --set PUBLICSHARE "$HOME"
|
|
xdg-user-dirs-update --set DESKTOP "$HOME"
|
|
rmdir ~/Templates ~/Public ~/Desktop 2>/dev/null || true
|
|
touch ~/.config/gtk-3.0/bookmarks
|
|
for dir in Downloads Projects Pictures Videos; do
|
|
bookmark="file://$HOME/$dir $dir"
|
|
grep -qxF "$bookmark" ~/.config/gtk-3.0/bookmarks || echo "$bookmark" >>~/.config/gtk-3.0/bookmarks
|
|
done
|
|
|
|
source "$OMARCHY_INSTALL/user/all.sh"
|
|
|
|
omarchy-refresh-applications
|
|
env -u BROWSER xdg-settings set default-web-browser chromium.desktop
|
|
xdg-mime default HEY.desktop x-scheme-handler/mailto
|
|
|
|
if (( first_install )); then
|
|
mkdir -p "$state_dir/migrations"
|
|
for migration in "$OMARCHY_PATH"/migrations/*.sh; do
|
|
[[ -f $migration ]] && touch "$state_dir/migrations/$(basename "$migration")"
|
|
done
|
|
fi
|
|
|
|
omarchy-done mark finalize-user
|
|
echo "User finalization complete."
|