add package group selection with work apps separation

Organize Brewfile into 16 @group sections (core, editors, work, databases,
etc.) so users can select which groups to install in interactive mode.
Work/enterprise apps (Slack, Zoom, Okta Verify, Windows App) are now a
separate selectable group. Selections persist to ~/.dotfiles-packages.

New --groups flag for CLI-level selection. Update script now snapshots to
Brewfile.snapshot instead of overwriting the organized Brewfile.

85 new test assertions, 370 total across all suites — zero failures.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: AnjanJ

.zshrc-work-completions

@@ -52,6 +52,7 @@ _dotfiles() {
                     '--work-dir[Work directory]:directory:_directories' \
                     '--theme[Theme]:theme:(tokyo-night aura catppuccin)' \
                     '--ssh[SSH mode]:mode:(1password existing generate skip)' \
+                    '--groups[Package groups to install]:groups' \
                     '--no-macos-defaults[Skip macOS defaults]' \
                     '--help[Show help]'
                 ;;
@@ -131,6 +132,7 @@ _dotfiles_install() {
         '--work-dir[Work directory]:directory:_directories' \
         '--theme[Theme]:theme:(tokyo-night aura catppuccin)' \
         '--ssh[SSH mode]:mode:(1password existing generate skip)' \
+        '--groups[Package groups to install]:groups' \
         '--no-macos-defaults[Skip macOS defaults]' \
         '--help[Show help]'
 }

Brewfile

@@ -1,3 +1,4 @@
+# @group taps — Homebrew tap registries (always included)
 tap "antoniorodr/memo"
 tap "charmbracelet/tap"
 tap "cloudflare/cloudflare"
@@ -9,95 +10,124 @@ tap "render-oss/render"
 tap "steipete/tap"
 tap "supabase/tap"
 tap "yakitrak/yakitrak"
-brew "glib"
+
+# @group core — Essential CLI tools (always installed)
 brew "bat"
-brew "cloudflared"
-brew "criterion"
 brew "direnv"
-brew "docker"
 brew "eza"
 brew "fd"
-brew "ffmpeg"
-brew "pango"
-brew "ffmpeg-full"
-brew "flyctl"
 brew "fzf"
-brew "gemini-cli"
 brew "gh"
 brew "git"
+brew "mas"
+brew "mise"
+brew "ripgrep"
+brew "shellcheck"
+brew "starship"
+brew "tree"
+brew "wget"
+brew "zoxide"
+
+# @group editors — Code editors & terminals
+brew "neovim"
+cask "ghostty"
+cask "visual-studio-code"
+cask "warp"
+cask "wezterm"
+cask "zed"
+
+# @group window-mgmt — Tiling window manager & status bar
+cask "nikitabobko/tap/aerospace"
+brew "felixkratz/formulae/borders"
+brew "felixkratz/formulae/sketchybar"
+
+# @group terminal-tools — Terminal enhancements & TUI tools
 brew "git-delta"
 brew "gitui"
-brew "heroku"
 brew "httpie"
 brew "lazydocker"
 brew "lazygit"
-brew "lazysql"
-brew "libidn"
-brew "libre"
-brew "librsvg"
-brew "libxmlsec1"
-brew "libyaml"
-brew "litecli"
 brew "lnav"
 brew "lsd"
-brew "mas"
-brew "mise"
-brew "mycli"
-brew "mysql", restart_service: :changed
-brew "neovim"
-brew "openssl@1.1"
 brew "pandoc"
-brew "pgcli"
-brew "pgvector"
-brew "poppler"
-brew "postgresql@14", restart_service: :changed
-brew "putty"
-brew "redis", restart_service: :changed
-brew "render"
-brew "ripgrep"
-brew "shared-mime-info"
-brew "shellcheck"
-brew "starship"
 brew "tailspin"
 brew "tldr", link: false
 brew "tlrc"
 brew "tmux"
-brew "tree"
 brew "unar"
-brew "uv"
 brew "weasyprint"
-brew "wget"
 brew "yazi"
-brew "yt-dlp"
 brew "zellij"
-brew "zig"
-brew "zoxide"
-brew "antoniorodr/memo/memo"
-brew "charmbracelet/tap/freeze", link: false
-brew "felixkratz/formulae/borders"
-brew "felixkratz/formulae/sketchybar"
-brew "steipete/tap/bird"
-brew "steipete/tap/gifgrep"
-brew "steipete/tap/goplaces"
-brew "steipete/tap/imsg"
-brew "steipete/tap/peekaboo"
-brew "steipete/tap/remindctl"
-brew "steipete/tap/sag"
-brew "steipete/tap/songsee"
-brew "steipete/tap/summarize"
-brew "steipete/tap/wacli"
+
+# @group databases — Database engines & GUI clients
+brew "litecli"
+brew "lazysql"
+brew "mycli"
+brew "mysql", restart_service: :changed
+brew "pgcli"
+brew "pgvector"
+brew "postgresql@14", restart_service: :changed
+brew "redis", restart_service: :changed
+cask "beekeeper-studio"
+cask "postico"
+cask "redis-insight"
+
+# @group cloud-deploy — Cloud & deployment CLIs
+brew "cloudflared"
+brew "docker"
+brew "flyctl"
+brew "heroku"
+brew "render"
 brew "supabase/tap/supabase"
-brew "yakitrak/yakitrak/obsidian-cli"
+cask "docker-desktop"
+
+# @group media — Media processing tools
+brew "ffmpeg"
+brew "ffmpeg-full"
+brew "glib"
+brew "librsvg"
+brew "pango"
+brew "poppler"
+brew "yt-dlp"
+cask "vlc"
+mas "Gifski", id: 1351639930
+mas "GIPHY CAPTURE", id: 668208984
+
+# @group communication — Personal messaging
+cask "discord"
+cask "signal"
+cask "telegram"
+mas "WhatsApp", id: 310633997
+
+# @group productivity — Personal productivity
 cask "1password"
 cask "1password-cli"
-cask "nikitabobko/tap/aerospace"
-cask "android-platform-tools"
-cask "beekeeper-studio"
-cask "bruno"
-cask "claude-code"
-cask "discord"
-cask "docker-desktop"
-cask "firefox"
+cask "notion"
+cask "obsidian"
+cask "proton-mail"
+cask "proton-pass"
+cask "protonvpn"
+cask "raycast"
+brew "antoniorodr/memo/memo"
+brew "yakitrak/yakitrak/obsidian-cli"
+mas "1Password for Safari", id: 1569813296
+mas "Dashlane", id: 517914548
+mas "Tailscale", id: 1475387142
+
+# @group work — Enterprise & work apps
+cask "slack"
+cask "zoom"
+mas "Okta Verify", id: 490179405
+mas "Windows App", id: 1295203466
+
+# @group languages — Language-specific tools
+brew "criterion"
+brew "uv"
+brew "zig"
+go "cmd/go"
+go "cmd/gofmt"
+
+# @group fonts — Nerd Fonts collection
 cask "font-0xproto-nerd-font"
 cask "font-3270-nerd-font"
 cask "font-adwaita-mono-nerd-font"
@@ -175,52 +205,8 @@ cask "font-ubuntu-nerd-font"
 cask "font-ubuntu-sans-nerd-font"
 cask "font-victor-mono-nerd-font"
 cask "font-zed-mono-nerd-font"
-cask "freeze"
-cask "ghostty"
-cask "notion"
-cask "obsidian"
-cask "postico"
-cask "proton-mail"
-cask "proton-pass"
-cask "protonvpn"
-cask "raycast"
-cask "redis-insight"
-cask "requestly"
-cask "signal"
-cask "slack"
-cask "telegram"
-cask "visual-studio-code"
-cask "vlc"
-cask "warp"
-cask "wezterm"
-cask "zed"
-cask "zen"
-cask "zoom"
-mas "1Password for Safari", id: 1569813296
-mas "2FAS - Two Factor Authentication", id: 6443941139
-mas "Bandwidth+", id: 490461369
-mas "Dashlane", id: 517914548
-mas "Developer", id: 640199958
-mas "DuckDuckGo", id: 663592361
-mas "Gifski", id: 1351639930
-mas "GIPHY CAPTURE", id: 668208984
-mas "Hidden Bar", id: 1452453066
-mas "iStat Menus", id: 1319778037
-mas "Kindle", id: 302584613
-mas "LanguageTool", id: 1534275760
-mas "LocalSend", id: 1661733229
-mas "Menu Bar Calendar", id: 1558360383
-mas "Noir", id: 1592917505
-mas "Numbers", id: 409203825
-mas "Okta Verify", id: 490179405
-mas "Perplexity", id: 6714467650
-mas "Save to Raindrop.io", id: 1549370672
-mas "Tailscale", id: 1475387142
-mas "TextSniper", id: 1528890965
-mas "Tot", id: 1491071483
-mas "WhatsApp", id: 310633997
-mas "Windows App", id: 1295203466
-mas "Xcode", id: 497799835
+
+# @group vscode-ext — VS Code extensions
 vscode "aaron-bond.better-comments"
 vscode "adpyke.codesnap"
 vscode "alefragnani.bookmarks"
@@ -331,5 +317,50 @@ vscode "xabikos.reactsnippets"
 vscode "yzhang.markdown-all-in-one"
 vscode "zh9528.file-size"
 vscode "zhuangtongfa.material-theme"
-go "cmd/go"
-go "cmd/gofmt"
+
+# @group mac-apps — Mac App Store apps
+mas "2FAS - Two Factor Authentication", id: 6443941139
+mas "Bandwidth+", id: 490461369
+mas "Developer", id: 640199958
+mas "DuckDuckGo", id: 663592361
+mas "Hidden Bar", id: 1452453066
+mas "iStat Menus", id: 1319778037
+mas "Kindle", id: 302584613
+mas "LanguageTool", id: 1534275760
+mas "LocalSend", id: 1661733229
+mas "Menu Bar Calendar", id: 1558360383
+mas "Noir", id: 1592917505
+mas "Numbers", id: 409203825
+mas "Perplexity", id: 6714467650
+mas "Save to Raindrop.io", id: 1549370672
+mas "TextSniper", id: 1528890965
+mas "Tot", id: 1491071483
+mas "Xcode", id: 497799835
+
+# @group extras — Miscellaneous utilities
+brew "gemini-cli"
+brew "libidn"
+brew "libre"
+brew "libxmlsec1"
+brew "libyaml"
+brew "openssl@1.1"
+brew "putty"
+brew "shared-mime-info"
+brew "charmbracelet/tap/freeze", link: false
+brew "steipete/tap/bird"
+brew "steipete/tap/gifgrep"
+brew "steipete/tap/goplaces"
+brew "steipete/tap/imsg"
+brew "steipete/tap/peekaboo"
+brew "steipete/tap/remindctl"
+brew "steipete/tap/sag"
+brew "steipete/tap/songsee"
+brew "steipete/tap/summarize"
+brew "steipete/tap/wacli"
+cask "android-platform-tools"
+cask "bruno"
+cask "claude-code"
+cask "firefox"
+cask "freeze"
+cask "requestly"
+cask "zen"

README.md

@@ -157,6 +157,7 @@ Both are **fully non-interactive** with sensible defaults. No prompts, no questi
 bash install.sh --name "AJ" --email "aj@example.com" --theme aura
 bash install.sh --work-email "aj@corp.com" --ssh generate
 bash install.sh --interactive          # Prompt for every choice (old behavior)
+bash install.sh --groups "core,editors,databases"  # Install only specific package groups
 bash install.sh --no-macos-defaults    # Skip macOS system preferences
 bash install.sh --force                # Force reinstall everything
 bash install.sh --help                 # Show all options
@@ -165,7 +166,7 @@ bash install.sh --help                 # Show all options
 ### What it does
 
 1. ✅ Install Homebrew (if not installed)
-2. ✅ Install all packages from Brewfile
+2. ✅ Install packages from Brewfile (interactive mode lets you select package groups; `--groups` to pick specific ones)
 3. ✅ Create symlinks to dotfiles (shell, tmux, Neovim, Zed, ~/bin)
 4. ✅ Apply your chosen theme (Tokyo Night, Aura Dark, or Catppuccin)
 5. ✅ Set up tmux plugins
@@ -515,14 +516,14 @@ All commands support tab-completion. Shorthand also works: `dotfiles-update`, `d
 
 1. Pull latest changes from git
 2. `brew update` + `brew upgrade` + `brew cleanup`
-3. Snapshot Brewfile (captures any new apps you installed manually)
+3. Snapshot installed packages and show diff against Brewfile (without overwriting the organized Brewfile)
 4. Refresh all symlinks
 5. Upgrade mise tools
 6. Update tmux plugins
 7. Reload live configs (tmux, aerospace)
 8. Commit & push changes back to repo
 
-**Your Brewfile stays in sync automatically.** Install apps with `brew install` or `mas install` anytime — the next `dotfiles update` captures them into the repo. One `Brewfile.backup` is kept for rollback.
+**Your Brewfile stays organized.** The Brewfile is organized into `@group` sections (core, editors, work, databases, etc.) and `dotfiles update` never overwrites it. The snapshot step shows you what's new or missing compared to your system. One `Brewfile.backup` is kept for rollback.
 
 ### Health Check
 

WHAT_GETS_INSTALLED.md

@@ -12,7 +12,13 @@ Installs [Homebrew](https://brew.sh/) (macOS package manager) if not already pre
 
 ## Step 2: Brewfile (~325 packages)
 
-Runs `brew bundle install` which installs everything declared in the `Brewfile`. This includes Homebrew formulas, cask apps, VS Code extensions, Mac App Store apps (via `mas`), and Go tools:
+Runs `brew bundle install` which installs packages declared in the `Brewfile`. This includes Homebrew formulas, cask apps, VS Code extensions, Mac App Store apps (via `mas`), and Go tools.
+
+The Brewfile is organized into **16 `@group` sections**: taps, core, editors, window-mgmt, terminal-tools, databases, cloud-deploy, media, communication, productivity, **work** (enterprise apps like Slack, Zoom, Okta Verify), languages, fonts, vscode-ext, mac-apps, and extras.
+
+- **Non-interactive mode** installs everything (or respects previous selections saved in `~/.dotfiles-packages`)
+- **Interactive mode** (`--interactive`) lets you toggle groups on/off and exclude individual packages within groups
+- **`--groups "core,editors,databases"`** installs only the specified groups
 
 ### Taps (10 third-party repos)