28dcbae376
* Restore preinstalls from the menu, and drop the Omacom apps with them Remove Preinstalls missed omacut, omacalc, and omawrite, so the three Omacom apps survived an opt-out that was supposed to clear the desk. Opting out was also one-way. Install > Preinstalls now puts everything back: the shipped .desktop launchers and mise stubs via omarchy-refresh-applications, the dropped packages via pacman, and the opt-out marker deleted so the preinstalled keybindings return on reload. The two menu entries guard on the marker, so exactly one of them is ever visible. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Trim the preinstall lists to what quattro actually ships Remove Preinstalls was still dropping typora, spotify, 1password, 1password-cli, signal-desktop, opencode, claude-code, and github-cli. None of those are in omarchy-base.packages anymore: typora gave way to omawrite, the services moved to on-demand menu installs, and the agent CLIs are mise-managed. Removing them took out apps the user had deliberately installed, and restoring them would have put back what we no longer ship. Both lists are now the same twelve packages, all of them in omarchy-base.packages. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Keep the opt-out marker when a restore fails omarchy-pkg-add exits non-zero when pacman cannot install a package, but the restore ran straight past it, cleared the marker, and reloaded Hyprland. That reported success and brought back keybindings for apps that never arrived. The marker now falls last, behind a check on the transaction. The new test also pins the two lists to each other and to omarchy-base.packages, which is the drift that let retired packages linger in the removal list. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
36 lines
1.1 KiB
Bash
Executable File
36 lines
1.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# omarchy:summary=Restore the preinstalled Omarchy applications (web apps, TUIs, and selected packages).
|
|
# omarchy:requires-sudo=true
|
|
|
|
if gum confirm "Are you sure you want to restore all preinstalled web apps, TUI wrappers, and desktop applications?"; then
|
|
echo -e "Restoring preinstalled Omarchy applications...\n"
|
|
|
|
# Recreates the shipped .desktop launchers (web apps and TUIs) and the mise stubs
|
|
# that back claude, gh, opencode, and the rest of the agents
|
|
omarchy-refresh-applications
|
|
|
|
# Mirrors the list in omarchy-remove-preinstalls; both track omarchy-base.packages
|
|
if ! omarchy-pkg-add \
|
|
aether \
|
|
cliamp \
|
|
libreoffice-fresh \
|
|
xournalpp \
|
|
pinta \
|
|
obsidian \
|
|
obs-studio \
|
|
kdenlive \
|
|
lazydocker \
|
|
omacut \
|
|
omacalc \
|
|
omawrite; then
|
|
echo -e "\nPreinstalls are still marked as removed. Fix the errors above and try again."
|
|
exit 1
|
|
fi
|
|
|
|
# Last, so a failure above leaves the opt-out intact rather than restoring
|
|
# keybindings for apps that never came back
|
|
rm -f ~/.local/state/omarchy/preinstalls-removed
|
|
hyprctl reload
|
|
fi
|