feat: refactor menus, iTerm2 plist flow, fastfetch menu, broken cask detection

- brew: detect casks registered in Homebrew but missing from /Applications, offer to reinstall
- customize: split Terminal into Terminal / Shell / FastFetch items
- terminal: iTerm2 uses defaults export/import plist instead of static profile.json
- terminal: add fastfetch_menu with install + apply config; support cat.txt logo
- terminal: rename setup_shell → shell_menu (loop), remove FastFetch from shell menu
- common: show_menu supports "---" separator (blank line, skipped in numbering)
- security: simplify privacy menu labels, add visual separator
- config: rename fastfetch.jsonc → config.jsonc, remove profile.json

Author: emylfy

CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 29.03
+
+### Features
+
+- **brew:** detect broken casks (registered in Homebrew but missing from `/Applications`) — prompt to reinstall silently
+- **customize:** split Terminal entry into separate Terminal / Shell / FastFetch items
+- **terminal:** iTerm2 now uses `defaults export/import` plist flow instead of a static `profile.json`
+- **terminal:** `fastfetch_menu` — dedicated menu with install + apply config options; supports `cat.txt` logo
+- **common:** `show_menu` supports `"---"` separator — renders as blank line, skipped in numbering
+- **security:** simplified privacy menu labels, added visual separator
+
+### Changes
+
+- `setup_shell` renamed to `shell_menu` (persistent loop); FastFetch moved to its own menu
+- `config/shell/fastfetch.jsonc` → `config/shell/config.jsonc`
+- `config/iterm2/profile.json` removed — replaced by plist-based export/import
+
+---
+
 ## 26.03
 
 Initial release.

apps/brew.sh

@@ -12,6 +12,7 @@ brew_menu() {
             "Utilities" \
             "Media" \
             "Communication" \
+            "---" \
             "Install ALL bundles" \
             "Import from .brewbak" \
             "Export to .brewbak" \
@@ -47,9 +48,10 @@ install_bundle() {
     local installed
     installed=$(brew list --formula -1 2>/dev/null; brew list --cask -1 2>/dev/null)
 
-    # Parse Brewfile — split into new and already installed
+    # Parse Brewfile — split into new, broken, and already installed
     local new_lines=()
     local new_labels=()
+    local broken_casks=()
     local installed_count=0
     while IFS= read -r line; do
         [[ "$line" =~ ^[[:space:]]*#.*$ || -z "${line// /}" ]] && continue
@@ -64,26 +66,65 @@ install_bundle() {
             continue
         fi
         if echo "$installed" | grep -qxF "$name"; then
+            # For casks, verify the .app actually exists in /Applications
+            if [[ "$line" =~ ^cask ]]; then
+                # || true prevents set -e from triggering if find exits non-zero
+                app_path=$(find /opt/homebrew/Caskroom/"$name" -name "*.app" -maxdepth 3 2>/dev/null | head -1) || true
+                if [[ -n "$app_path" ]]; then
+                    appname=$(basename "$app_path")
+                    if [[ ! -e "/Applications/$appname" ]]; then
+                        # Registered in brew but .app is missing — queue for silent reinstall
+                        broken_casks+=("$name")
+                        continue
+                    fi
+                fi
+            fi
             installed_count=$((installed_count + 1))
         else
             new_lines+=("$line")
             new_labels+=("$label")
         fi
     done < "$path"
 
-    # Show installed count
     if [[ $installed_count -gt 0 ]]; then
         log_ok "$installed_count already installed"
     fi
 
+    # Handle missing apps separately — ask user once, then fix silently
+    if [[ ${#broken_casks[@]} -gt 0 ]]; then
+        printf "\n"
+        log_warn "${#broken_casks[@]} app(s) are missing from Applications"
+        for cask in "${broken_casks[@]}"; do
+            printf "  ${DIM}· %s${RESET}\n" "$cask"
+        done
+        printf "\n"
+        printf "  ${DIM}This will reinstall the apps listed above.${RESET}\n"
+        printf "\n"
+        if confirm "Fix them now?"; then
+            printf "\n"
+            for cask in "${broken_casks[@]}"; do
+                log_info "Reinstalling $cask..."
+                if brew reinstall --cask "$cask"; then
+                    log_ok "$cask reinstalled"
+                else
+                    log_warn "Failed to reinstall $cask"
+                fi
+                printf "\n"
+            done
+            printf "  ${DIM}press enter to continue${RESET} "
+            read -r < /dev/tty || true
+        fi
+        printf "\n"
+    fi
+
     if [[ ${#new_labels[@]} -eq 0 ]]; then
         log_ok "Everything installed"
         printf "\n"
         confirm "Back" || true
         return 0
     fi
 
-    # Multiselect only new packages
+    # Multiselect for new packages only
     local selected
     selected=$(show_multiselect "$brewfile" "${new_labels[@]}")
 
@@ -92,7 +133,7 @@ install_bundle() {
         return 0
     fi
 
-    # Build temp Brewfile with selected packages only
+    # Build temp Brewfile with selected packages
     local tmp
     tmp=$(mktemp /tmp/macrift_brew_XXXXXX)
 
@@ -175,6 +216,20 @@ import_brewbak() {
             continue
         fi
         if echo "$installed" | grep -qxF "$name"; then
+            # For casks, verify the .app actually exists in /Applications
+            if [[ "$line" =~ ^cask ]]; then
+                # || true prevents set -e from triggering if find exits non-zero
+                app_path=$(find /opt/homebrew/Caskroom/"$name" -name "*.app" -maxdepth 3 2>/dev/null | head -1) || true
+                if [[ -n "$app_path" ]]; then
+                    appname=$(basename "$app_path")
+                    if [[ ! -e "/Applications/$appname" ]]; then
+                        # Registered in brew but .app is missing — treat as broken
+                        new_lines+=("$line")
+                        new_labels+=("$label [broken]")
+                        continue
+                    fi
+                fi
+            fi
             installed_count=$((installed_count + 1))
         else
             new_lines+=("$line")

apps/customize_menu.sh

@@ -7,17 +7,22 @@ customize_menu() {
         set_title "macrift > customize"
         local choice
         choice=$(show_menu "Customize" \
-            "Terminal (iTerm2 / Ghostty)" \
+            "Terminal" \
+            "Shell" \
+            "FastFetch" \
             "Code Editor" \
-            "Spicetify (restore marketplace)" \
+            "Spicetify" \
+            "---" \
             "Wallpaper" \
             "Back")
 
         case "$choice" in
             1) source "$MACRIFT_DIR/apps/terminal.sh" && terminal_menu ;;
-            2) source "$MACRIFT_DIR/apps/editor.sh" && editor_menu ;;
-            3) source "$MACRIFT_DIR/apps/spicetify.sh" && restore_marketplace ;;
-            4) source "$MACRIFT_DIR/apps/wallpaper.sh" && wallpaper_menu ;;
+            2) source "$MACRIFT_DIR/apps/terminal.sh" && shell_menu ;;
+            3) source "$MACRIFT_DIR/apps/terminal.sh" && fastfetch_menu ;;
+            4) source "$MACRIFT_DIR/apps/editor.sh" && editor_menu ;;
+            5) source "$MACRIFT_DIR/apps/spicetify.sh" && restore_marketplace ;;
+            6) source "$MACRIFT_DIR/apps/wallpaper.sh" && wallpaper_menu ;;
             0) return ;;
             *) ;;
         esac

apps/editor.sh

@@ -7,7 +7,7 @@ editor_menu() {
         set_title "macrift > editor"
 
         local choice
-        choice=$(show_menu "Code Editor - copy settings.json" \
+        choice=$(show_menu "Code Editor" \
             "VSCode" \
             "Cursor" \
             "Windsurf" \

apps/terminal.sh

@@ -6,16 +6,14 @@ terminal_menu() {
         clear
         set_title "macrift > terminal"
         local choice
-        choice=$(show_menu "Terminal Setup" \
-            "iTerm2 — install + import config" \
-            "Ghostty — install + copy config" \
-            "Shell setup (Starship + FastFetch)" \
+        choice=$(show_menu "Terminal" \
+            "iTerm2" \
+            "Ghostty" \
             "Back")
 
         case "$choice" in
             1) setup_iterm2 ;;
             2) setup_ghostty ;;
-            3) setup_shell ;;
             0) return ;;
             *) ;;
         esac
@@ -27,19 +25,38 @@ setup_iterm2() {
 
     if ! brew_install "iterm2" "cask"; then return; fi
 
-    local config_source="$MACRIFT_DIR/config/iterm2/profile.json"
-    if [[ ! -f "$config_source" ]]; then
-        log_warn "No iTerm2 profile found in config/iterm2/profile.json"
-        log_info "You can add your profile there and re-run this"
-        return
-    fi
+    local config_dir="$MACRIFT_DIR/config/iterm2"
+    local config_plist="$config_dir/iterm2.plist"
 
-    if confirm "Import iTerm2 profile?"; then
-        # Tell iTerm2 to use custom prefs folder
-        defaults write com.googlecode.iterm2 PrefsCustomFolder -string "$MACRIFT_DIR/config/iterm2"
-        defaults write com.googlecode.iterm2 LoadPrefsFromCustomFolder -bool true
-        log_ok "iTerm2 configured to load profile from macrift config"
-    fi
+    mkdir -p "$config_dir"
+
+    local choice
+    choice=$(show_menu "iTerm2" \
+        "Export current settings to macrift config" \
+        "Import settings from macrift config" \
+        "Back")
+
+    case "$choice" in
+        1)
+            defaults export com.googlecode.iterm2 "$config_plist"
+            log_ok "Settings exported to config/iterm2/iterm2.plist"
+            ;;
+        2)
+            if [[ ! -f "$config_plist" ]]; then
+                log_err "No settings found in config/iterm2/iterm2.plist"
+                log_info "Run export first to save your current settings"
+                return
+            fi
+            if confirm "Import iTerm2 settings? (restart iTerm2 to apply)"; then
+                defaults import com.googlecode.iterm2 "$config_plist"
+                # Remove stale custom folder setting that causes startup errors
+                defaults delete com.googlecode.iterm2 PrefsCustomFolder 2>/dev/null || true
+                defaults delete com.googlecode.iterm2 LoadPrefsFromCustomFolder 2>/dev/null || true
+                log_ok "Settings imported — restart iTerm2 to apply"
+            fi
+            ;;
+        0) return ;;
+    esac
 }
 
 setup_ghostty() {
@@ -62,25 +79,26 @@ setup_ghostty() {
     fi
 }
 
-setup_shell() {
-    divider "Shell Setup"
+shell_menu() {
+    while true; do
+        clear
+        set_title "macrift > shell"
 
-    local choice
-    choice=$(show_menu "Shell Components" \
-        "Starship prompt" \
-        "FastFetch" \
-        "Copy .zshrc" \
-        "All of the above" \
-        "Back")
+        local choice
+        choice=$(show_menu "Shell" \
+            "Starship prompt" \
+            "Copy .zshrc" \
+            "Both" \
+            "Back")
 
-    case "$choice" in
-        1) install_starship ;;
-        2) install_fastfetch ;;
-        3) install_zshrc ;;
-        4) install_starship; install_fastfetch; install_zshrc ;;
-        0) return ;;
-        *) ;;
-    esac
+        case "$choice" in
+            1) install_starship ;;
+            2) install_zshrc ;;
+            3) install_starship; install_zshrc ;;
+            0) return ;;
+            *) ;;
+        esac
+    done
 }
 
 install_starship() {
@@ -109,15 +127,69 @@ install_starship() {
 install_fastfetch() {
     if ! brew_install "fastfetch"; then return; fi
 
-    local config_source="$MACRIFT_DIR/config/shell/fastfetch.jsonc"
+    local config_source="$MACRIFT_DIR/config/shell/config.jsonc"
     local config_target="$HOME/.config/fastfetch/config.jsonc"
 
     if [[ -f "$config_source" ]]; then
         if confirm "Copy FastFetch config?"; then
             copy_config "$config_source" "$config_target"
         fi
     else
-        log_info "Add your fastfetch.jsonc to config/shell/ to auto-import"
+        log_info "Add your config.jsonc to config/shell/ to auto-import"
+    fi
+}
+
+fastfetch_menu() {
+    while true; do
+        clear
+        set_title "macrift > fastfetch"
+        local choice
+        choice=$(show_menu "FastFetch" \
+            "Install FastFetch" \
+            "Apply config from macrift" \
+            "Back")
+
+        case "$choice" in
+            1) install_fastfetch ;;
+            2) apply_fastfetch_config ;;
+            0) return ;;
+            *) ;;
+        esac
+    done
+}
+
+apply_fastfetch_config() {
+    divider "FastFetch Config"
+
+    local config_source="$MACRIFT_DIR/config/shell/config.jsonc"
+    local config_target="$HOME/.config/fastfetch/config.jsonc"
+
+    if [[ ! -f "$config_source" ]]; then
+        log_err "No config found at config/shell/config.jsonc"
+        return
+    fi
+
+    # Warn if host format is hardcoded to a specific model
+    if grep -q '"format"' "$config_source" && grep -A1 '"type": "host"' "$config_source" | grep -q '"format"'; then
+        local host_format
+        host_format=$(grep -A2 '"type": "host"' "$config_source" | grep '"format"' | sed 's/.*"format": *"\(.*\)".*/\1/')
+        if [[ "$host_format" != "{name}" && -n "$host_format" ]]; then
+            log_warn "Host is hardcoded to: $host_format"
+            if confirm "Replace with dynamic {name}?"; then
+                sed -i '' "s|\"format\": \"$host_format\"|\"format\": \"{name}\"|" "$config_source"
+                log_ok "Fixed — will now show actual model name"
+            fi
+        fi
+    fi
+
+    if confirm "Copy FastFetch config?"; then
+        copy_config "$config_source" "$config_target"
+        # Copy logo file if present
+        local logo_source="$MACRIFT_DIR/config/shell/cat.txt"
+        local logo_target="$HOME/.config/fastfetch/cat.txt"
+        if [[ -f "$logo_source" ]]; then
+            copy_config "$logo_source" "$logo_target"
+        fi
     fi
 }
 

common.sh

@@ -43,10 +43,11 @@ show_menu() {
     local count=${#items[@]}
     local last_idx=$((count - 1))
 
-    # Calculate box width from longest item
+    # Calculate box width from longest item (skip separators)
     local max_len=0
     local i
     for ((i=0; i<count; i++)); do
+        [[ "${items[$i]}" == "---" ]] && continue
         if [[ ${#items[$i]} -gt $max_len ]]; then
             max_len=${#items[$i]}
         fi
@@ -68,9 +69,14 @@ show_menu() {
     printf "╮${RESET}\n" >&2
     # │ (empty)   │
     printf "  ${BOLD}${PURPLE}│${RESET}%*s${BOLD}${PURPLE}│${RESET}\n" "$inner_w" "" >&2
-    # │  N › Item │  (items 1..N-1)
+    # │  N › Item │  (items 1..N-1, "---" renders as blank separator line)
+    local num=0
     for ((i=0; i<last_idx; i++)); do
-        local num=$((i + 1))
+        if [[ "${items[$i]}" == "---" ]]; then
+            printf "  ${BOLD}${PURPLE}│${RESET}%*s${BOLD}${PURPLE}│${RESET}\n" "$inner_w" "" >&2
+            continue
+        fi
+        num=$((num + 1))
         local vis=$((2 + 1 + 3 + ${#items[$i]}))
         local pad=$((inner_w - vis))
         printf "  ${BOLD}${PURPLE}│${RESET}  ${CYAN}%d${RESET} ${DIM}›${RESET} %s%*s${BOLD}${PURPLE}│${RESET}\n" "$num" "${items[$i]}" "$pad" "" >&2