itsscb/omarchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add remove menu and tune up theme-remove script

Browse Source
This commit is contained in:
David Heinemeier Hansson 2025-08-05 10:30:44 +02:00
parent 2cd841a687
commit d1b09e27a0
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/omarchy-menu
View File

@ -88,8 +88,8 @@ show_setup_menu() {
} }
show_install_menu() { show_install_menu() {
case $(menu "Install" "󰣇 Packages\n󰸌 Theme\n Dropbox\n Steam\n Docker DBs") in case $(menu "Install" "󰣇 Package\n󰸌 Theme\n Dropbox\n Steam\n Docker DBs") in
*Packages*) terminal $OMARCHY_BIN_PATH/omarchy-cmd-install ;; *Package*) terminal $OMARCHY_BIN_PATH/omarchy-cmd-install ;;
*Theme*) terminal $OMARCHY_BIN_PATH/omarchy-theme-install ;; *Theme*) terminal $OMARCHY_BIN_PATH/omarchy-theme-install ;;
*Dropbox*) terminal $OMARCHY_BIN_PATH/omarchy-setup-dropbox ;; *Dropbox*) terminal $OMARCHY_BIN_PATH/omarchy-setup-dropbox ;;
*Steam*) terminal $OMARCHY_BIN_PATH/omarchy-setup-steam ;; *Steam*) terminal $OMARCHY_BIN_PATH/omarchy-setup-steam ;;
@ -98,6 +98,16 @@ show_install_menu() {
esac esac
} }
show_remove_menu() {
case $(menu "Remove" "󰣇 Package\n󰸌 Theme\n󰈷 Fingerprint\n Fido2") in
*Package*) terminal $OMARCHY_BIN_PATH/omarchy-cmd-uninstall ;;
*Theme*) present_terminal $OMARCHY_BIN_PATH/omarchy-theme-remove ;;
*Fingerprint*) terminal "$OMARCHY_BIN_PATH/omarchy-setup-fingerprint --remove" ;;
*Fido2*) terminal "$OMARCHY_BIN_PATH/omarchy-setup-fido2 --remove" ;;
*) show_main_menu ;;
esac
}
show_update_menu() { show_update_menu() {
case $(menu "Update" "󰣇 Omarchy ($OMARCHY_VERSION)\n Configs\n󰸌 Themes\n Timezone") in case $(menu "Update" "󰣇 Omarchy ($OMARCHY_VERSION)\n Configs\n󰸌 Themes\n Timezone") in
*Omarchy*) terminal $OMARCHY_BIN_PATH/omarchy-update ;; *Omarchy*) terminal $OMARCHY_BIN_PATH/omarchy-update ;;
@ -134,7 +144,7 @@ show_system_menu() {
} }
show_main_menu() { show_main_menu() {
case $(menu "Start" "󰀻 Apps\n󰧑 Learning\n Capture\n󰔎 Toggle\n Style\n Setup\n󰉉 Install\n Update\n System") in case $(menu "Start" "󰀻 Apps\n󰧑 Learning\n Capture\n󰔎 Toggle\n Style\n Setup\n󰉉 Install\n󰭌 Remove\n Update\n System") in
*Apps*) walker -p "Launch…" ;; *Apps*) walker -p "Launch…" ;;
*Learn*) show_learn_menu ;; *Learn*) show_learn_menu ;;
*Capture*) show_capture_menu ;; *Capture*) show_capture_menu ;;
@ -142,6 +152,7 @@ show_main_menu() {
*Style*) show_style_menu ;; *Style*) show_style_menu ;;
*Setup*) show_setup_menu ;; *Setup*) show_setup_menu ;;
*Install*) show_install_menu ;; *Install*) show_install_menu ;;
*Remove*) show_remove_menu ;;
*Update*) show_update_menu ;; *Update*) show_update_menu ;;
*System*) show_system_menu ;; *System*) show_system_menu ;;
esac esac
@ -157,6 +168,7 @@ case "$1" in
*toggle*) show_toggle_menu ;; *toggle*) show_toggle_menu ;;
*setup*) show_setup_menu ;; *setup*) show_setup_menu ;;
*install*) show_install_menu ;; *install*) show_install_menu ;;
*remove*) show_remove_menu ;;
*update*) show_update_menu ;; *update*) show_update_menu ;;
*system*) show_system_menu ;; *system*) show_system_menu ;;
*) show_main_menu ;; *) show_main_menu ;;

24
bin/omarchy-theme-remove
View File

@ -4,17 +4,26 @@
# Usage: omarchy-theme-remove <theme-name> # Usage: omarchy-theme-remove <theme-name>
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Usage: omarchy-theme-remove <theme-name>" extra_themes=$(find ~/.config/omarchy/themes -mindepth 1 -maxdepth 1 -type d ! -xtype l -printf '%f\n')
if [[ -n "$extra_themes" ]]; then
THEME_NAME=$(gum choose --header="Remove extra theme" "$extra_themes")
else
echo "No extra themes installed."
exit 1 exit 1
fi
else
THEME_NAME="$1"
fi fi
THEME_NAME="$1"
THEMES_DIR="$HOME/.config/omarchy/themes" THEMES_DIR="$HOME/.config/omarchy/themes"
BACKGROUND_DIR="$HOME/.config/omarchy/backgrounds"
CURRENT_DIR="$HOME/.config/omarchy/current" CURRENT_DIR="$HOME/.config/omarchy/current"
THEME_PATH="$THEMES_DIR/$THEME_NAME" THEME_PATH="$THEMES_DIR/$THEME_NAME"
BACKGROUND_PATH="$BACKGROUND_DIR/$THEME_NAME"
# Ensure a theme was set
if [ -z "$THEME_NAME" ]; then
exit 1
fi
# Check if theme exists before attempting removal # Check if theme exists before attempting removal
if [ ! -d "$THEME_PATH" ]; then if [ ! -d "$THEME_PATH" ]; then
@ -22,11 +31,10 @@ if [ ! -d "$THEME_PATH" ]; then
exit 1 exit 1
fi fi
# Use readlink -f to resolve symlinks and get the absolute path # Move to the next theme if the current theme is the one being removed
if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then if [ "$(readlink -f "$CURRENT_DIR/theme")" = "$(readlink -f "$THEME_PATH")" ]; then
~/.local/share/omarchy/bin/omarchy-theme-next ~/.local/share/omarchy/bin/omarchy-theme-next
fi fi
# Now remove the theme directory and backgrounds for THEME_NAME # Now remove the theme directory for THEME_NAME
rm -rf "$THEME_PATH" rm -rf "$THEME_PATH"
rm -rf "$BACKGROUND_PATH"