neovim via brew, bootstrap prereqs, deep-removal script [minor-release]

Move neovim from custom GitHub tarball installer to brew formula.
Remove git/curl/zsh from brew lists (now bootstrap prereqs via apt on
Linux, built-in on macOS). Add deep-removal.sh that wipes CPS, brew
packages, and OMZ while preserving ~/.zsh_history and Homebrew itself.
Replace migrate-v1.3.0.sh with the new script. Update README with
bootstrap section and prerequisite install one-liners.

Author: Tanq16

README.md

@@ -11,11 +11,22 @@ A single Go binary (`cps`) that sets up and manages a complete CLI development e
 
 ## Prerequisites
 
-| Requirement | Why |
+### Bootstrap (Linux only)
+
+macOS has these out of the box (git via Xcode CLT, zsh built-in, curl built-in). On Linux:
+
+```bash
+sudo apt install git curl zsh build-essential
+```
+
+### Install these (both platforms)
+
+| Requirement | One-line install |
 |---|---|
-| [Oh My Zsh](https://ohmyz.sh/) | Shell framework — `cps init` will not run without it |
-| Git | Used to clone plugins and configs |
-| [Homebrew](https://brew.sh/) | System package installs (both Linux and macOS) — `cps` installs all system/cloud CLI packages via brew |
+| [Oh My Zsh](https://ohmyz.sh/) | `sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
+| [Homebrew](https://brew.sh/) | `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"` |
+
+Both are required — `cps init` won't run without them. CPS uses brew for all system and cloud CLI packages.
 
 **Recommended:**
 
@@ -144,15 +155,8 @@ CPS uses a modular fragment system instead of a monolithic `.zshrc`:
 
 ## Deep Removal
 
-```bash
-# CPS directories
-rm -rf $HOME/shell $HOME/.tmux $HOME/.config/nvim $HOME/.config/cps
+Run the included script to wipe CPS, CPS-installed brew packages, and Oh My Zsh. Homebrew itself and `~/.zsh_history` are preserved so you can reinstall cleanly without rebuilding your shell history or re-bootstrapping brew.
 
-# Configs
-rm -f $HOME/.tmux.conf $HOME/.zshrc $HOME/.aerospace.toml $HOME/.config/kitty/kitty.conf $HOME/.config/kitty/current-theme.conf
-rm -rf $HOME/.local/share/nvim $HOME/.oh-my-zsh
-rm -f $HOME/.local/bin/cps
-
-# Uninstall brew-managed system and cloud packages (optional)
-brew uninstall awscli azure-cli gcloud-cli
+```bash
+./deep-removal.sh
 ```

deep-removal.sh

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+# Deep removal of CPS + CPS-installed brew packages + Oh My Zsh.
+# Homebrew itself is preserved. ~/.zsh_history is preserved.
+#
+# After running this, you can start fresh by:
+#   1. Reinstalling Oh My Zsh (Homebrew stays)
+#   2. Reinstalling the cps binary
+#   3. Running `cps init`
+
+echo "CPS deep removal"
+echo ""
+echo "Will remove:"
+echo "  - cps binary (~/.local/bin/cps)"
+echo "  - CPS directories (~/shell, ~/.tmux, ~/.config/nvim, ~/.config/cps, ~/.local/share/nvim)"
+echo "  - CPS-deployed configs (.zshrc, .tmux.conf, .aerospace.toml, kitty configs)"
+echo "  - Oh My Zsh (~/.oh-my-zsh)"
+echo "  - Brew packages installed by CPS (neovim, cloud CLIs, core/dev/network/media tools)"
+echo ""
+echo "Will preserve:"
+echo "  - ~/.zsh_history"
+echo "  - Homebrew itself"
+echo "  - System tools (git, curl, zsh from apt or macOS built-in)"
+echo ""
+read -rp "Continue? [y/N] " ans
+case "$ans" in
+  [yY]|[yY][eE][sS]) ;;
+  *) echo "aborted"; exit 0 ;;
+esac
+
+echo ""
+echo "==> removing cps binary"
+rm -f "$HOME/.local/bin/cps"
+
+echo "==> removing CPS-managed directories"
+rm -rf "$HOME/shell"
+rm -rf "$HOME/.tmux"
+rm -rf "$HOME/.config/nvim"
+rm -rf "$HOME/.config/cps"
+rm -rf "$HOME/.local/share/nvim"
+
+echo "==> removing CPS-deployed configs"
+rm -f "$HOME/.tmux.conf"
+rm -f "$HOME/.zshrc"
+rm -f "$HOME/.aerospace.toml"
+rm -f "$HOME/.config/kitty/kitty.conf"
+rm -f "$HOME/.config/kitty/current-theme.conf"
+
+if command -v brew >/dev/null 2>&1; then
+  echo "==> uninstalling CPS-installed brew formulas"
+  brew uninstall --ignore-dependencies \
+    wget zip unzip file tmux htop neovim \
+    cmake gcc make ninja gettext \
+    nmap openssl ffmpeg \
+    awscli azure-cli \
+    2>/dev/null || true
+
+  echo "==> uninstalling CPS-installed brew casks"
+  brew uninstall --cask --force gcloud-cli 2>/dev/null || true
+  brew uninstall --cask --force nikitabobko/tap/aerospace 2>/dev/null || true
+else
+  echo "==> brew not found, skipping brew package uninstall"
+fi
+
+echo "==> removing Oh My Zsh"
+rm -rf "$HOME/.oh-my-zsh"
+
+echo ""
+echo "done."
+echo "preserved: ~/.zsh_history, Homebrew itself"
+echo ""
+echo "to start fresh:"
+echo "  1. reinstall Oh My Zsh:"
+echo "     sh -c \"\$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)\""
+echo "  2. reinstall cps:"
+echo "     see https://github.com/tanq16/cli-productivity-suite#install"
+echo "  3. cps init"

internal/installer/language_runtime.go

@@ -22,8 +22,6 @@ type LanguageRuntimeInstaller struct{}
 
 func (l *LanguageRuntimeInstaller) Install(tool *registry.Tool, p platform.Platform, gh *github.Client, st *state.State) Result {
 	switch tool.Name {
-	case "neovim":
-		return l.installNeovim(p, gh, st)
 	case "go-sdk":
 		return l.installGo(p, st)
 	case "uv":
@@ -41,67 +39,6 @@ func (l *LanguageRuntimeInstaller) Install(tool *registry.Tool, p platform.Platf
 	}
 }
 
-func (l *LanguageRuntimeInstaller) installNeovim(p platform.Platform, gh *github.Client, st *state.State) Result {
-	var archStr string
-	switch p.Arch {
-	case platform.AMD64:
-		archStr = "x86_64"
-	case platform.ARM64:
-		archStr = "arm64"
-	}
-
-	var osStr string
-	switch p.OS {
-	case platform.Darwin:
-		osStr = "macos"
-	default:
-		osStr = "linux"
-	}
-
-	url := fmt.Sprintf("https://github.com/neovim/neovim/releases/download/stable/nvim-%s-%s.tar.gz", osStr, archStr)
-
-	// Temp dir inside p.ShellDir() so os.Rename stays on the same filesystem (avoids EXDEV on Linux tmpfs /tmp).
-	tmpDir, err := os.MkdirTemp(p.ShellDir(), "cps-neovim-*")
-	if err != nil {
-		return Result{Tool: "neovim", Err: err}
-	}
-	defer os.RemoveAll(tmpDir)
-
-	tarPath := filepath.Join(tmpDir, "nvim.tar.gz")
-	if err := DownloadToFile(url, tarPath); err != nil {
-		return Result{Tool: "neovim", Err: fmt.Errorf("download failed: %w", err)}
-	}
-
-	if p.OS == platform.Darwin {
-		xattrCmd := exec.Command("xattr", "-c", tarPath)
-		utils.RunCmd(xattrCmd)
-	}
-
-	if err := ExtractTarGz(tarPath, tmpDir); err != nil {
-		return Result{Tool: "neovim", Err: fmt.Errorf("extract failed: %w", err)}
-	}
-
-	extractedDir := filepath.Join(tmpDir, fmt.Sprintf("nvim-%s-%s", osStr, archStr))
-	nvimDir := filepath.Join(p.ShellDir(), "nvim")
-	os.RemoveAll(nvimDir)
-	if err := os.Rename(extractedDir, nvimDir); err != nil {
-		return Result{Tool: "neovim", Err: fmt.Errorf("move to %s failed: %w", nvimDir, err)}
-	}
-
-	symlinkPath := filepath.Join(p.ShellExecDir(), "nvim")
-	os.Remove(symlinkPath)
-	if err := os.Symlink(filepath.Join(nvimDir, "bin", "nvim"), symlinkPath); err != nil {
-		return Result{Tool: "neovim", Err: fmt.Errorf("symlink failed: %w", err)}
-	}
-
-	version := "stable"
-	if release, err := gh.LatestRelease("neovim/neovim"); err == nil {
-		version = release.TagName
-	}
-	st.SetToolVersion("neovim", version)
-	return Result{Tool: "neovim", Version: version}
-}
-
 func (l *LanguageRuntimeInstaller) installGo(p platform.Platform, st *state.State) Result {
 	type goDL struct {
 		Version string `json:"version"`

internal/registry/manifest.go

@@ -163,18 +163,19 @@ var AllTools = []Tool{
 	{
 		Name: "core-utils", Kind: SystemPackage, Category: System,
 		Description: "Core system utilities",
-		BrewPkgs:    []string{"git", "wget", "curl", "zip", "unzip", "file"},
+		BrewPkgs:    []string{"wget", "zip", "unzip", "file"},
 	},
 	{
 		Name: "shell-base", Kind: SystemPackage, Category: System,
 		Description: "Shell and terminal essentials",
-		BrewPkgs:    []string{"tmux", "zsh", "htop"},
+		BrewPkgs:    []string{"tmux", "htop"},
 	},
 
-	// ========== Language Runtimes (base only) ==========
+	// ========== Neovim (via brew) ==========
 	{
-		Name: "neovim", Kind: LanguageRuntime, Category: Runtime,
+		Name: "neovim", Kind: SystemPackage, Category: System,
 		Description: "Neovim text editor (0.11+ for NvChad)",
+		BrewPkgs:    []string{"neovim"},
 	},
 
 	// ========== Config Files ==========

internal/runner/runner.go

@@ -84,27 +84,20 @@ func Init(ghToken string) {
 	}
 	st.Save()
 
-	// Phase 5: Neovim
-	neovim := filterByName(reg.ByKind(registry.LanguageRuntime), "neovim")
-	if runPhase("Phase 5: Neovim", neovim, p, gh, st) {
-		hadErrors = true
-	}
-	st.Save()
-
-	// Phase 6: Shell plugins (base only, exclude extension tools)
+	// Phase 5: Shell plugins (base only, exclude extension tools)
 	disableOMZSlowPaste(p)
-	if runPhase("Phase 6: Shell plugins", filterBaseTools(reg.ByKind(registry.ShellPlugin)), p, gh, st) {
+	if runPhase("Phase 5: Shell plugins", filterBaseTools(reg.ByKind(registry.ShellPlugin)), p, gh, st) {
 		hadErrors = true
 	}
 	st.Save()
 
-	// Phase 7: Config files
-	if runPhase("Phase 7: Config files", filterPlatformTools(reg.ByKind(registry.ConfigFile), p), p, gh, st) {
+	// Phase 6: Config files
+	if runPhase("Phase 6: Config files", filterPlatformTools(reg.ByKind(registry.ConfigFile), p), p, gh, st) {
 		hadErrors = true
 	}
 	st.Save()
 
-	// Phase 8: Post-install tasks
+	// Phase 7: Post-install tasks
 	runPostInstall(p)
 
 	st.LastInit = time.Now()
@@ -222,7 +215,7 @@ func runPhase(phaseName string, tools []registry.Tool, p platform.Platform, gh *
 }
 
 func runPostInstall(p platform.Platform) {
-	utils.PrintRunning("(Running) Phase 8: Post-install tasks")
+	utils.PrintRunning("(Running) Phase 7: Post-install tasks")
 	var lineCount int
 	var errors []jobResult
 
@@ -237,8 +230,7 @@ func runPostInstall(p platform.Platform) {
 		}
 	}
 
-	nvimBin := filepath.Join(p.ShellExecDir(), "nvim")
-	if _, err := os.Stat(nvimBin); err == nil {
+	if nvimBin, err := exec.LookPath("nvim"); err == nil {
 		utils.PrintIndentedRunning("nvchad-setup: running")
 		lineCount++
 		nvimCmd := exec.Command(nvimBin, "--headless", "+MasonInstallAll", "+Lazy sync", "+qa")
@@ -251,12 +243,12 @@ func runPostInstall(p platform.Platform) {
 
 	utils.ClearLines(lineCount + 1) // sub-lines + running header
 	if len(errors) > 0 {
-		utils.PrintError("Phase 8: partially completed with errors", nil)
+		utils.PrintError("Phase 7: partially completed with errors", nil)
 		for _, e := range errors {
 			utils.PrintIndentedError(e.name, e.err)
 		}
 	} else {
-		utils.PrintInfo("Phase 8: Post-install tasks")
+		utils.PrintInfo("Phase 7: Post-install tasks")
 	}
 }
 
@@ -363,20 +355,6 @@ func filterBaseTools(tools []registry.Tool) []registry.Tool {
 	return result
 }
 
-func filterByName(tools []registry.Tool, names ...string) []registry.Tool {
-	nameSet := make(map[string]bool, len(names))
-	for _, n := range names {
-		nameSet[n] = true
-	}
-	var result []registry.Tool
-	for _, t := range tools {
-		if nameSet[t.Name] {
-			result = append(result, t)
-		}
-	}
-	return result
-}
-
 func isOwnTool(repo string) bool {
 	return strings.HasPrefix(repo, "Tanq16/")
 }