Small nvim updates (#188)

Author: binarypie

dot_files/nvim/README.md

@@ -12,8 +12,7 @@ distrobox required.
 
 - **Editor:** Neovim + LazyVim with Hypercube customizations.
 - **AI agents:** Claude Code (`claude`), OpenAI Codex (`codex`), Antigravity
-  (`agy`), GitHub CLI (`gh`). Wired into nvim via `claudecode.nvim` and
-  `sidekick.nvim`.
+  (`agy`), GitHub CLI (`gh`). Wired into nvim via `sidekick.nvim`.
 - **Languages & runtimes:** Go, Python 3.12, Node.js, Ruby, Lua, Rust.
 - **Formatters:** stylua, prettier, shfmt, gofumpt, goimports, black, isort, ruff.
 - **Linters:** shellcheck, hadolint, eslint, golangci-lint.
@@ -96,9 +95,8 @@ return {
 
 ## AI keymaps
 
-- `<leader>a…` — Claude Code (claudecode.nvim, LazyVim defaults)
-- `<leader>A…` — sidekick.nvim agents: `Ac` Claude, `Ax` Codex, `Aa` toggle
-  last, `As` send selection, `Ap` ask with prompt
+- `<leader>a…` — sidekick.nvim agents: `ac` Claude, `ax` Codex, `ag`
+  Antigravity, `aa` toggle last, `as` send selection, `ap` ask with prompt
 - `<Tab>` — apply/jump sidekick Next Edit Suggestion (falls through to `<Tab>`
   when Copilot isn't signed in)
 

dot_files/nvim/config/lua/hypercube/plugins/ai.lua

@@ -3,9 +3,8 @@
 -- Edit Suggestions (NES). The agent CLIs are baked into the container image and
 -- resolved via PATH.
 --
--- Claude is handled by the deeper claudecode.nvim integration under `<leader>a`
--- (see extras.lua), so it is intentionally NOT bound here -- sidekick covers the
--- other agents (Codex, Antigravity) under `<leader>A`.
+-- All agents (Claude, Codex, Antigravity) are bound under `<leader>a`. `claude`
+-- and `codex` are sidekick built-in presets; Antigravity is a custom CLI tool.
 
 return {
   {
@@ -38,45 +37,53 @@ return {
         desc = "Sidekick: goto/apply Next Edit Suggestion",
       },
       {
-        "<leader>A",
+        "<leader>a",
         "",
-        desc = "+ai (sidekick)",
+        desc = "+ai",
         mode = { "n", "v" },
       },
       {
-        "<leader>Aa",
+        "<leader>aa",
         function()
           require("sidekick.cli").toggle()
         end,
         desc = "Sidekick: toggle last CLI",
         mode = { "n", "v" },
       },
       {
-        "<leader>Ax",
+        "<leader>ac",
+        function()
+          require("sidekick.cli").toggle({ name = "claude", focus = true })
+        end,
+        desc = "Sidekick: Claude",
+        mode = { "n", "v" },
+      },
+      {
+        "<leader>ax",
         function()
           require("sidekick.cli").toggle({ name = "codex", focus = true })
         end,
         desc = "Sidekick: Codex",
         mode = { "n", "v" },
       },
       {
-        "<leader>Ag",
+        "<leader>ag",
         function()
           require("sidekick.cli").toggle({ name = "agy", focus = true })
         end,
         desc = "Sidekick: Antigravity",
         mode = { "n", "v" },
       },
       {
-        "<leader>As",
+        "<leader>as",
         function()
           require("sidekick.cli").send({ msg = "{selection}" })
         end,
         desc = "Sidekick: send selection",
         mode = { "v" },
       },
       {
-        "<leader>Ap",
+        "<leader>ap",
         function()
           require("sidekick.cli").prompt()
         end,

dot_files/nvim/config/lua/hypercube/plugins/extras.lua

@@ -2,9 +2,8 @@
 -- Pre-configured language support and editor enhancements
 
 return {
-  -- AI: Claude Code (deep in-editor integration: diffs, MCP, terminal).
-  -- Complemented by sidekick.nvim (see ai.lua) for multi-CLI agents + NES.
-  { import = "lazyvim.plugins.extras.ai.claudecode" },
+  -- AI agents are handled entirely by sidekick.nvim (see ai.lua): Claude,
+  -- Codex, and Antigravity in an embedded terminal, plus Copilot-powered NES.
 
   -- Coding enhancements
   { import = "lazyvim.plugins.extras.coding.yanky" },

dot_files/nvim/config/lua/hypercube/plugins/init.lua

@@ -6,7 +6,7 @@ return {
   -- Import Hypercube UI customizations
   { import = "hypercube.plugins.ui" },
 
-  -- Import Hypercube extras (language support, claudecode, etc.)
+  -- Import Hypercube extras (language support, etc.)
   { import = "hypercube.plugins.extras" },
 
   -- Import Hypercube AI (sidekick.nvim)