feat: codecompanion.nvim

flake.lock

@@ -139,11 +139,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1738410390,
+        "lastModified": 1738680400,
-        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+        "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+        "rev": "799ba5bffed04ced7067a91798353d360788b30d",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1738557153,
+        "lastModified": 1738831044,
-        "narHash": "sha256-KbuxOVz6SCBCkjJufqmdhItzhf8OCBKnRP+JWE9EFlo=",
+        "narHash": "sha256-6y2I2h4hX8d+LXLCzgu7QJ3Wvkx89R0x3WFQ5ovhwco=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3d89be6655a3ca15643456199b491b524929f61c",
+        "rev": "e4b6440d7ca1649bb95bd59f39b2279db959e498",
         "type": "github"
       },
       "original": {

nix/neovim-overlay.nix

@@ -14,11 +14,11 @@ with final.pkgs.lib; let
 
   all-plugins = with pkgs.vimPlugins; [
     aerial-nvim
-    avante-nvim
     inputs.nixpkgs-master.legacyPackages.${pkgs.system}.vimPlugins.blink-cmp
     blink-cmp-copilot
     blink-compat
     blink-ripgrep-nvim
+    codecompanion-nvim
     copilot-lua
     diffview-nvim
     eyeliner-nvim

nvim/lua/plugins/ai.lua

@@ -2,10 +2,19 @@ return {
   {
     "zbirenbaum/copilot.lua",
     cmd = "Copilot",
+    keys = {
+      {
+        'M-\\',
+        '<cmd>Copilot panel<CR>',
+        noremap = true,
+        desc = 'Copilot panel'
+      }
+    },
     opts = {
-      panel = { enabled = false },
+      panel = { enabled = true, keymap = { accept = "ga" } },
       suggestion = {
         enabled = true,
+        auto_trigger = true,
         keymap = {
           accept = "<M-]>",
           next = "<M-[>",
@@ -43,36 +52,50 @@ return {
     }
   },
   {
-    "yetone/avante.nvim",
+    "olimorris/codecompanion.nvim",
     cmd = "Copilot",
     dependencies = {
-      "stevearc/dressing.nvim",
       "nvim-lua/plenary.nvim",
-      "MunifTanjim/nui.nvim",
+      "nvim-treesitter/nvim-treesitter",
       "zbirenbaum/copilot.lua",
+    },
+    opts = {
+      adapters = {
+        copilot = function()
+          return require("codecompanion.adapters").extend("copilot", {
+            name = "copilot-claude-3.5-sonnet",
+            schema = { model = "claude-3.5-sonnet", },
+          })
+        end
+      },
+      strategies = {
+        chat = { adapter = "copilot-claude-3.5-sonnet", },
+        inline = { adapter = "copilot-claude-3.5-sonnet", },
+      },
+    },
+    init = function()
+      vim.api.nvim_create_user_command('CC', ':CodeCompanion', {})
+    end,
+    keys = {
       {
-        'MeanderingProgrammer/render-markdown.nvim',
+        '<leader>ac',
-        opts = {
+        '<cmd>CodeCompanionChat Toggle<CR>',
-          file_types = { "markdown", "Avante" },
+        noremap = true,
+        desc = 'Copilot chat toggle'
       },
-        ft = { "markdown", "Avante" },
+      {
+        '<leader>as',
+        '<cmd>CodeCompanionChat Add<CR>',
+        noremap = true,
+        desc = 'Copilot chat add selection'
       },
-    },
+      {
-    opts = {
+        '<leader>aa',
-      provider = "copilot",
+        '<cmd>CodeCompanionActions<CR>',
-      -- auto_suggestions_provider = "copilot",
+        noremap = true,
-      behavior = {
+        desc = 'Copilot inline'
-        auto_suggestions = false, -- TODO
-      },
-      file_selector = {
-        provider = "native", -- TODO snacks once it's ready
-      },
-      windows = {
-        width = 50,
-        ask = {
-          floating = true
-        }
-      }
       }
     }
+
+  },
 }

nvim/lua/plugins/completion.lua

@@ -3,7 +3,6 @@ return {
     'saghen/blink.cmp',
     event = "VeryLazy",
     dependencies = {
-      { "yetone/avante.nvim", lazy = true },
       'saghen/blink.compat',
       'rafamadriz/friendly-snippets',
       'giuxtaposition/blink-cmp-copilot',
@@ -34,8 +33,7 @@ return {
           "snippets",
           "buffer",
           "ripgrep",
-          "avante_commands",
+          "copilot"
-          "avante_mentions",
         },
         providers = {
           ripgrep = {
@@ -43,18 +41,12 @@ return {
             name = "rg",
             score_offset = -10,
           },
-          avante_commands = {
+          copilot = {
-            name = "avante_commands",
+            name = "copilot",
-            module = "blink.compat.source",
+            module = "blink-cmp-copilot",
-            score_offset = 90,
+            score_offset = 100,
-            opts = {},
+            async = true,
           },
-          avante_mentions = {
-            name = "avante_mentions",
-            module = "blink.compat.source",
-            score_offset = 1000,
-            opts = {},
-          }
         }
       },
       keymap = {
@@ -77,6 +69,8 @@ return {
           }
         },
         menu = {
+          -- auto show in cmdline
+          auto_show = true,
           draw = {
             treesitter = { "lsp" },
             columns = {

nvim/lua/plugins/lsp.lua

@@ -7,7 +7,8 @@ return {
       {
         '<leader>de',
         '<cmd>Trouble diagnostics toggle focus=true<CR>',
-        { noremap = true, desc = 'Trouble diagnostics' }
+        noremap = true,
+        desc = 'Trouble diagnostics'
       }
     }
   },

nvim/lua/plugins/misc.lua

@@ -164,10 +164,15 @@ return {
       ring = {
         storage = "memory",
       },
+      picker = {
+        select = {
+          action = require('yanky.picker').actions.set_register("+")
+        }
+      }
     },
     keys = {
       { "y",          "<Plug>(YankyYank)",         mode = { "n", "x" } },
-      { "<leader>fp", "<cmd>YankyRingHistory<cr>", { mode = { "n", "x" }, noremap = true, silent = true, desc = 'Pick history (yanky.nvim)' } }
+      { "<leader>fp", "<cmd>YankyRingHistory<cr>", mode = { "n", "x" }, noremap = true, silent = true, desc = 'Pick history (yanky.nvim)' }
     },
   },
 }