feat: add folke/sidekick.nvim

Author: ALameLlama

lua/astrocommunity/ai/sidekick-nivm/init.lua

@@ -1,6 +1,3 @@
-local cli_tool = vim.g.sidekick_cli_tool or "opencode"
-local prefix = "<Leader>A"
-
 ---@type LazySpec
 return {
   "folke/sidekick.nvim",
@@ -10,11 +7,79 @@ return {
       ---@param opts AstroCoreOpts
       opts = function(_, opts)
         local maps = assert(opts.mappings)
+        local prefix = "<Leader>A"
+        
+        -- Normal mode mappings
         maps.n[prefix] = { desc = require("astroui").get_icon("Sidekick", 1, true) .. "Sidekick" }
+        maps.n[prefix .. "a"] = {
+          function() require("sidekick.cli").toggle {} end,
+          desc = "Sidekick Toggle CLI",
+        }
+        maps.n[prefix .. "s"] = {
+          function() require("sidekick.cli").select {} end,
+          desc = "Select CLI",
+        }
+        maps.n[prefix .. "d"] = {
+          function() require("sidekick.cli").close {} end,
+          desc = "Detach a CLI Session",
+        }
+        maps.n[prefix .. "t"] = {
+          function() require("sidekick.cli").send { msg = "{this}" } end,
+          desc = "Send This",
+        }
+        maps.n[prefix .. "f"] = {
+          function() require("sidekick.cli").send { msg = "{file}" } end,
+          desc = "Send File",
+        }
+        maps.n[prefix .. "p"] = {
+          function() require("sidekick.cli").prompt {} end,
+          desc = "Sidekick Select Prompt",
+        }
+        maps.n["<Tab>"] = {
+          function()
+            if not require("sidekick").nes_jump_or_apply() then return "<Tab>" end
+          end,
+          expr = true,
+          desc = "Goto/Apply Next Edit Suggestion",
+        }
+        maps.n["<C-.>"] = {
+          function() require("sidekick.cli").toggle {} end,
+          desc = "Sidekick Toggle",
+        }
+        
+        -- Visual mode mappings
         maps.x[prefix] = { desc = require("astroui").get_icon("Sidekick", 1, true) .. "Sidekick" }
+        maps.x[prefix .. "t"] = {
+          function() require("sidekick.cli").send { msg = "{this}" } end,
+          desc = "Send This",
+        }
+        maps.x[prefix .. "v"] = {
+          function() require("sidekick.cli").send { msg = "{selection}" } end,
+          desc = "Send Visual Selection",
+        }
+        maps.x[prefix .. "p"] = {
+          function() require("sidekick.cli").prompt {} end,
+          desc = "Sidekick Select Prompt",
+        }
+        maps.x["<C-.>"] = {
+          function() require("sidekick.cli").toggle {} end,
+          desc = "Sidekick Toggle",
+        }
+        
+        -- Insert mode mappings
+        maps.i["<C-.>"] = {
+          function() require("sidekick.cli").toggle {} end,
+          desc = "Sidekick Toggle",
+        }
+        
+        -- Terminal mode mappings
+        maps.t["<C-.>"] = {
+          function() require("sidekick.cli").toggle {} end,
+          desc = "Sidekick Toggle",
+        }
       end,
     },
-    { "AstroNvim/astroui", opts = { icons = { Sidekick = "" } } },
+    { "AstroNvim/astroui", opts = { icons = { Sidekick = "" } } },
   },
   opts = {
     nes = {
@@ -26,58 +91,5 @@ return {
       },
     },
   },
-  keys = {
-    {
-      "<tab>",
-      function()
-        if not require("sidekick").nes_jump_or_apply() then return "<Tab>" end
-      end,
-      expr = true,
-      desc = "Goto/Apply Next Edit Suggestion",
-    },
-    {
-      "<c-.>",
-      function() require("sidekick.cli").toggle { name = cli_tool } end,
-      desc = "Sidekick Toggle",
-      mode = { "n", "t", "i", "x" },
-    },
-    {
-      prefix .. "a",
-      function() require("sidekick.cli").toggle { name = cli_tool } end,
-      desc = "Sidekick Toggle CLI",
-    },
-    {
-      prefix .. "s",
-      function() require("sidekick.cli").select { name = cli_tool } end,
-      desc = "Select CLI",
-    },
-    {
-      prefix .. "d",
-      function() require("sidekick.cli").close { name = cli_tool } end,
-      desc = "Detach a CLI Session",
-    },
-    {
-      prefix .. "t",
-      function() require("sidekick.cli").send { name = cli_tool, msg = "{this}" } end,
-      mode = { "x", "n" },
-      desc = "Send This",
-    },
-    {
-      prefix .. "f",
-      function() require("sidekick.cli").send { name = cli_tool, msg = "{file}" } end,
-      desc = "Send File",
-    },
-    {
-      prefix .. "v",
-      function() require("sidekick.cli").send { name = cli_tool, msg = "{selection}" } end,
-      mode = { "x" },
-      desc = "Send Visual Selection",
-    },
-    {
-      prefix .. "p",
-      function() require("sidekick.cli").prompt { name = cli_tool } end,
-      mode = { "n", "x" },
-      desc = "Sidekick Select Prompt",
-    },
-  },
 }
+