diff --git a/MIGRATION_PLAN.md b/MIGRATION_PLAN.md index 2f0137a..f78d3c9 100644 --- a/MIGRATION_PLAN.md +++ b/MIGRATION_PLAN.md @@ -225,58 +225,77 @@ Source of truth for the step-by-step rebuild. Keep this concise and up to date. - [x] Add keymap to toggle undotree - [x] Configure minimal settings -## Phase 7 — Git, Markdown, Copilot, Formatting +## Phase 7 — Git Integration ## Phase 7.1 — Confirm scope and priorities -- [ ] Confirm scope and priorities for this phase +- [x] Confirm scope and priorities for this phase +- [x] Decision: Gitsigns with minimal config - signs in gutter, hunk navigation/actions only +- [x] Decision: Skip markdown rendering plugins entirely -## Phase 7.2 — Git +## Phase 7.2 — Gitsigns - [ ] Add `lewis6991/gitsigns.nvim` +- [ ] Configure signs in gutter (add, change, delete, topdelete, changedelete) +- [ ] Add hunk navigation keymaps (]h/[h for next/prev hunk) +- [ ] Add hunk action keymaps (stage, reset, preview) +- [ ] Keep minimal - no inline blame, no advanced features -## Phase 7.3 — Markdown -- [ ] Add `render-markdown.nvim` - -## Phase 7.4 — Copilot -- [ ] Add `zbirenbaum/copilot.lua` + `copilot-cmp` - -## Phase 7.5 — Formatting -- [ ] Add `nvimtools/none-ls.nvim` with minimal formatters/linters - -## Phase 8 — Migrate Kept Behaviours +## Phase 8 — Copilot ## Phase 8.1 — Confirm scope and priorities - [ ] Confirm scope and priorities for this phase -## Phase 8.2 — Abbreviations -- [ ] Abbreviations: `adn→and`, `waht→what`, `tehn→then`, `functin→function`, `positin→position` +## Phase 8.2 — Copilot setup +- [ ] Add `zbirenbaum/copilot.lua` + `copilot-cmp` +- [ ] Configure copilot integration with nvim-cmp +- [ ] Add keymaps for copilot suggestions +- [ ] Configure behavior preferences -## Phase 8.3 — Templates -- [ ] Templates: auto-populate new `.sh` from template - -## Phase 8.4 — Whitespace highlighting -- [ ] Whitespace highlighting (modern approach) - -## Phase 8.5 — Persistent folds -- [ ] Persistent folds (via UFO) - -## Phase 9 — Cleanup & Validation +## Phase 9 — Formatting & Linting ## Phase 9.1 — Confirm scope and priorities - [ ] Confirm scope and priorities for this phase -## Phase 9.2 — Retire legacy files +## Phase 9.2 — none-ls setup +- [ ] Add `nvimtools/none-ls.nvim` +- [ ] Configure formatters (to be determined in 9.1) +- [ ] Configure linters (to be determined in 9.1) +- [ ] Add format-on-save or manual format keymaps + +## Phase 10 — Migrate Kept Behaviours + +## Phase 10.1 — Confirm scope and priorities +- [ ] Confirm scope and priorities for this phase + +## Phase 10.2 — Abbreviations +- [ ] Abbreviations: `adn→and`, `waht→what`, `tehn→then`, `functin→function`, `positin→position` + +## Phase 10.3 — Templates +- [ ] Templates: auto-populate new `.sh` from template + +## Phase 10.4 — Whitespace highlighting +- [ ] Whitespace highlighting (modern approach) + +## Phase 10.5 — Persistent folds +- [ ] Persistent folds (via UFO) + +## Phase 11 — Cleanup & Validation + +## Phase 11.1 — Confirm scope and priorities +- [ ] Confirm scope and priorities for this phase + +## Phase 11.2 — Retire legacy files - [ ] Retire legacy Vimscript files (keep for reference until verified) -## Phase 9.3 — Startup performance +## Phase 11.3 — Startup performance - [ ] Validate startup performance (no errors, fast launch) -## Phase 9.4 — Tab workflow validation +## Phase 11.4 — Tab workflow validation - [ ] Validate tab-per-context workflow with Neo-tree (if used) -## Phase 9.5 — Navigation validation +## Phase 11.5 — Navigation validation - [ ] Validate Telescope navigation + LSP jumps -## Phase 9.6 — Language tooling validation +## Phase 11.6 — Language tooling validation - [ ] Validate HTML/PHP/JS/Markdown tooling ---