diff --git a/modules/nvim/config/lazy-lock.json b/modules/nvim/config/lazy-lock.json
index 749b42c..dec8414 100644
--- a/modules/nvim/config/lazy-lock.json
+++ b/modules/nvim/config/lazy-lock.json
@@ -1,6 +1,7 @@
 {
   "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
   "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" },
+  "codecompanion.nvim": { "branch": "main", "commit": "3d62ac3ebe840245b157e169d06b8d87ee878dc5" },
   "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
   "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
   "follow-md-links.nvim": { "branch": "main", "commit": "ce8735a15dc3e5fc5bb052ec51b849c03e57df53" },
@@ -9,6 +10,7 @@
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
   "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "mini.diff": { "branch": "main", "commit": "f7bcd3cb4561f7d3a02ae9afafeda899c82f7108" },
   "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
   "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
   "nvim-lint": { "branch": "master", "commit": "b47cbb249351873e3a571751c3fb66ed6369852f" },
diff --git a/modules/nvim/config/lua/plugins/blink.lua b/modules/nvim/config/lua/plugins/blink.lua
index 525895e..1f288bb 100644
--- a/modules/nvim/config/lua/plugins/blink.lua
+++ b/modules/nvim/config/lua/plugins/blink.lua
@@ -28,7 +28,10 @@ return {
     },
     sources = {
       default = { "lazydev", "lsp", "path", "snippets", "buffer" },
-      per_filetype = { sql = { "dadbod" } },
+      per_filetype = {
+        sql = { "dadbod" },
+        codecompanion = { "codecompanion" },
+      },
       providers = {
         dadbod = { module = "vim_dadbod_completion.blink" },
         lazydev = {
diff --git a/modules/nvim/config/lua/plugins/codecompanion.lua b/modules/nvim/config/lua/plugins/codecompanion.lua
new file mode 100644
index 0000000..1b71fe0
--- /dev/null
+++ b/modules/nvim/config/lua/plugins/codecompanion.lua
@@ -0,0 +1,25 @@
+return {
+  "olimorris/codecompanion.nvim",
+  opts = {
+    strategies = {
+      chat = {
+        adapter = "anthropic",
+      },
+      inline = {
+        adapter = "anthropic",
+      },
+    },
+  },
+  config = function()
+    vim.cmd([[cab cc CodeCompanion]])
+  end,
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-treesitter/nvim-treesitter",
+  },
+  keys = {
+    { "<leader>ac", "<cmd>CodeCompanionChat Toggle<cr>", desc = "Open companion chat", mode = "n" },
+    { "<leader>aa", "<cmd>CodeCompanionActions<cr>", desc = "Open companion actions", mode = "n" },
+    { "ga", "<cmd>CodeCompanionChat Add<cr>", desc = "Add selection to chat", mode = "v" },
+  },
+}
diff --git a/modules/nvim/config/lua/plugins/mini.diff.lua b/modules/nvim/config/lua/plugins/mini.diff.lua
new file mode 100644
index 0000000..d8627ff
--- /dev/null
+++ b/modules/nvim/config/lua/plugins/mini.diff.lua
@@ -0,0 +1,9 @@
+return {
+  "echasnovski/mini.diff",
+  config = function()
+    local diff = require("mini.diff")
+    diff.setup({
+      source = diff.gen_source.none(),
+    })
+  end,
+}