fix for new neovim

plugin/00_options.lua

@@ -66,8 +66,9 @@ if vim.fn.has('nvim-0.11') == 1 then
   vim.o.winborder = 'rounded' -- Use double-line as default border
 end
 if vim.fn.has('nvim-0.12') == 1 then
-  vim.o.pummaxwidth = 100                                 -- Limit maximum width of popup menu
-  vim.o.completefuzzycollect = 'keyword,files,whole_line' -- Use fuzzy matching when collecting candidates
+  vim.o.pummaxwidth = 100 -- Limit maximum width of popup menu
+  --  vim.o.completefuzzycollect = 'keyword,files,whole_line' -- Use fuzzy matching when collecting candidates
+  vim.opt.completeopt = { "menu", "popup", "fuzzy", "longest" }
 end
 
 vim.o.complete = '.,w,b,kspell' -- Use spell check and don't use tags for completion

plugin/10_keymap.lua

@@ -67,18 +67,18 @@ nmap_leader('<S-Tab>', '<Cmd>bprev<CR>', 'Prev buffer')
 
 -- a is for 'AI'
 nmap_leader("ac", "<cmd>CodeCompanionChat Toggle<CR>", "Chat Toggle")
-nmap_leader("ae", "<cmd>CodeCompanion /explain<CR>", "Explain Code")
-nmap_leader("af", "<cmd>CodeCompanion /fix<CR>", "Fix Code")
+-- nmap_leader("ae", "<cmd>CodeCompanion /explain<CR>", "Explain Code")
+-- nmap_leader("af", "<cmd>CodeCompanion /fix<CR>", "Fix Code")
 nmap_leader("ag", "<cmd>CodeCompanion /commit<CR>", "Generate commit message")
 nmap_leader("ai", "<cmd>CodeCompanionActions<CR>", "Chat Action")
 nmap_leader("al", "<cmd>CodeCompanion /lsp<CR>", "Explain LSP Diagnostics")
 nmap_leader("an", "<cmd>CodeCompanionChat Add<CR>", "Chat New")
 nmap_leader("as", "<cmd>CodeCompanion /suggest<CR>", "Suggest Improvements")
-nmap_leader("ax", "<cmd>CodeCompanion /fixer<CR>", "Code Fixer")
+--nmap_leader("ax", "<cmd>CodeCompanion /fixer<CR>", "Code Fixer")
 nmap_leader("ax", "<cmd>CodeCompanion /fixer<CR>", "Code Fixer")
 xmap_leader("ae", "<cmd>CodeCompanion /explain<CR>", "Explain Code")
 xmap_leader("af", "<cmd>CodeCompanion /fix<CR>", "Fix Code")
-xmap_leader("ap", "<cmd>CodeCompanion /expert<CR>", "Code Fixer")
+--xmap_leader("ap", "<cmd>CodeCompanion /expert<CR>", "Code Fixer")
 xmap_leader("ap", "<cmd>CodeCompanion /expert<CR>", "Code Fixer")
 xmap_leader("as", "<cmd>CodeCompanion /suggest<CR>", "Suggest Improvements")
 

plugin/24_completion.lua

@@ -1,5 +1,6 @@
 local add = Config.add
 local later = MiniDeps.later
+local now = MiniDeps.now
 local now_if_args = Config.now_if_args
 
 -- Constants
@@ -83,16 +84,33 @@ end
 
 local function get_codecompanion_config()
   return {
-    adapters = {
-      http = {
-        copilot = function()
-          return require("codecompanion.adapters").extend("copilot", {
-            schema = {
-              model = { default = "gemini-3-pro-preview" }
-            }
-          })
-        end,
-      }
+    interactions = {
+      chat = {
+        adapter = {
+          name = "copilot",
+          model = "gemini-3.1-pro-preview",
+        },
+        opts = {
+          completion_provider = "blink",
+        },
+      },
+      inline = {
+        adapter = {
+          name = "copilot",
+          model = "gemini-3.1-pro-preview",
+        }
+      },
+      keymaps = {
+        accept_change = {
+          modes = { n = "ga" },
+          description = "Accept the suggested change",
+        },
+        reject_change = {
+          modes = { n = "gr" },
+          opts = { nowait = true },
+          description = "Reject the suggested change",
+        },
+      },
     },
     display = {
       chat = {
@@ -105,10 +123,10 @@ local function get_codecompanion_config()
       },
     },
     prompt_library = {
-      ["Code Expert"] = {
-        strategy = "chat",
+      ["expert"] = {
+        interaction = "chat",
         description = "Get expert advice from an LLM",
-        opts = create_common_opts("<localleader>ae", "expert"),
+        --opts = create_common_opts("<localleader>ae", "expert"),
         prompts = {
           {
             role = "system",
@@ -125,10 +143,10 @@ local function get_codecompanion_config()
           },
         },
       },
-      ["Code Fixer"] = {
-        strategy = "chat",
+      ["fixer"] = {
+        interaction = "chat",
         description = "Fix code errors with expert guidance",
-        opts = create_common_opts("<localleader>af", "afixer"),
+        --opts = create_common_opts("<localleader>af", "afixer"),
         prompts = {
           {
             role = "system",
@@ -145,17 +163,10 @@ local function get_codecompanion_config()
           },
         },
       },
-      ["Suggest"] = {
-        strategy = "chat",
+      ["suggest"] = {
+        interaction = "chat",
         description = "Suggest improvements to the buffer",
-        opts = {
-          mapping = "<localleader>as",
-          modes = { "v" },
-          short_name = "suggest",
-          auto_submit = true,
-          user_prompt = false,
-          stop_context_insertion = false,
-        },
+        --opts = create_common_opts("<localleader>as", "suggest"),
         prompts = {
           {
             role = "system",