Implemented chat and inline functionality with codecompanion!!

lazy-lock.json

@@ -3,14 +3,14 @@
   "base16-nvim": { "branch": "master", "commit": "23e5128eb5f629c29532c24a1e733cbe019f05bb" },
   "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "codecompanion.nvim": { "branch": "main", "commit": "6cbbcb4503430644f04ea5f087c8e2ea4cdc6f6e" },
   "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
   "dashboard-nvim": { "branch": "master", "commit": "f787e3462c2ee2b6117b17c1aa4ddf66cb6f57fe" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "distant.nvim": { "branch": "v0.3", "commit": "67d6b066e8490725718b79f643966f4eafc7da3c" },
-  "fd": { "branch": "master", "commit": "42b2ab8a84ddedf80eeed9079128c60161f64658" },
+  "fd": { "branch": "master", "commit": "f7d4d717c287a7834f8721efc0fa91c51d92afee" },
   "fzf-lua": { "branch": "main", "commit": "988416cc782dfe28bff3f0da9b8c943b236cd86a" },
   "gemini-cli.nvim": { "branch": "main", "commit": "c9fd62adda823628f5131a939d9c56ef7a898600" },
-  "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "25050e4ed39e628282831d4cbecb1850454ce915" },
   "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
   "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" },
   "hex.nvim": { "branch": "master", "commit": "b46e63356a69e8d6f046c38a9708d55d17f15038" },
@@ -25,8 +25,8 @@
   "lualine.nvim": { "branch": "master", "commit": "221ce6b2d999187044529f49da6554a92f740a96" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "0a695750d747db1e7e70bcf0267ef8951c95fc83" },
   "mason.nvim": { "branch": "main", "commit": "16ba83bfc8a25f52bb545134f5bee082b195c460" },
-  "mini.nvim": { "branch": "main", "commit": "232ceeb14f7f7e849056309b85cb2fed712db46f" },
-  "mini.pick": { "branch": "main", "commit": "26f94e9c84f529d713de00b900c0a307ca260f35" },
+  "mini.nvim": { "branch": "main", "commit": "cbae4fa396bbf9c802b3d2dc2e9c5362e8fb9468" },
+  "mini.pick": { "branch": "main", "commit": "34fdef3b0966974378c4f39e3ddb54ffc628fbe9" },
   "neogit": { "branch": "master", "commit": "99326a1310fb2d616b455d2fd16d01bf00682f06" },
   "neoscroll.nvim": { "branch": "master", "commit": "c8d29979cb0cb3a2437a8e0ae683fd82f340d3b8" },
   "nui-components.nvim": { "branch": "main", "commit": "1654dd709f13874089eefc80d82e0eb667f7fdfb" },
@@ -35,17 +35,18 @@
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
   "nvim-dap": { "branch": "master", "commit": "531771530d4f82ad2d21e436e3cc052d68d7aebb" },
   "nvim-java": { "branch": "main", "commit": "602a5f7fa92f9c1d425a2159133ff9de86842f0a" },
-  "nvim-lspconfig": { "branch": "master", "commit": "9573948c38bfabeec353ae7dd7d3ffec4c506a6b" },
+  "nvim-lspconfig": { "branch": "master", "commit": "229b79051b380377664edc4cbd534930154921a1" },
   "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" },
   "nvim-tree.lua": { "branch": "master", "commit": "07f541fcaa4a5ae019598240362449ab7e9812b3" },
   "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
   "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" },
-  "obsidian.nvim": { "branch": "main", "commit": "5c496925ee6ce475092c927de4ca05cfb6b12883" },
+  "obsidian.nvim": { "branch": "main", "commit": "239af7e896d1857d0a644253d2c7e571d38529a5" },
   "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
+  "remote-nvim.nvim": { "branch": "main", "commit": "9992c2fb8bf4f11aca2c8be8db286b506f92efcb" },
   "render-markdown.nvim": { "branch": "main", "commit": "5adf0895310c1904e5abfaad40a2baad7fe44a07" },
   "resize.nvim": { "branch": "main", "commit": "0b8943ef2ce54e65b9e56974e94dee593b28e7b5" },
-  "ripgrep": { "branch": "master", "commit": "4857d6fa67db69a95cd4b6f2adda5d807d4d0119" },
+  "ripgrep": { "branch": "master", "commit": "48a6ad93f152dc848f1883ceb3bf2c7baab6738c" },
   "snacks.nvim": { "branch": "main", "commit": "882c996cf28183f4d63640de0b4c02ec886d01f2" },
   "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" },
   "sudo.nvim": { "branch": "main", "commit": "10c211716f0f0149ea91732bc12338ade76d4af8" },

lua/keybinds.lua

@@ -56,12 +56,12 @@ vim.keymap.set("n","<C-S-k>"		,"<C-w>K"						,{ desc = "Move window to the upper
 -- vim.keymap.set("n", "<leader>a", ":IncRename ", {desc = 'ren[A]me variable under cursor'})
 
 -- PLUGIN KEYBINDS
--- gemini CLI bindngs
--- TODO better AI implementation
-vim.keymap.set('n',"<leader>a/"		,"<cmd>Gemini toggle<cr>"				,{ desc = "Toggle Gemini CLI" })
-vim.keymap.set('n',"<leader>aa"		,"<cmd>Gemini toggle<cr>"				,{ desc = "Toggle Gemini CLI" })
-vim.keymap.set('n',"<leader>aq"		,"<cmd>Gemini ask<cr>"					,{ desc = "Ask Gemini", })
-vim.keymap.set('n',"<leader>af"		,"<cmd>Gemini add_file<cr>"				,{ desc = "Add File"} )
+vim.keymap.set({ "n", "v" }	,"<leader>aa"	,"<cmd>CodeCompanionActions<cr>"			,{ desc = "CodeCompanion - Actions" })
+vim.keymap.set({ "n", "v" }	,"<leader>ac"	,"<cmd>CodeCompanionChat Toggle<cr>"			,{ desc = "CodeCompanion - Chat" })
+vim.keymap.set({ "n", "v" }	,"<leader>ai"	,"<cmd>CodeCompanion<cr>"				,{ desc = "CodeCompanion - Inline" })
+vim.keymap.set("v"		,"<leader>ad"	,"<cmd>CodeCompanionChat Add<cr>"			,{ desc = "CodeCompanion - Add to Chat" })
+-- Expand 'cc' into 'CodeCompanion' in the command line
+vim.cmd([[cab cc CodeCompanion]])
 
 --spellcheck keybind to toggle on current buffer
 vim.keymap.set('n',"<leader>ze"		,"<cmd>setlocal spell<cr>"				,{ desc = "enable spellecheck on buffer" })

lua/options.lua

@@ -37,8 +37,8 @@ vim.o.updatetime = 250
 -- Decrease mapped sequence wait time
 vim.o.timeoutlen = 300
 -- Configure how new splits should be opened
--- vim.o.splitright = false
--- vim.o.splitbelow = true
+vim.o.splitright = true
+vim.o.splitbelow = true
 vim.o.list = true
 vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
 -- Preview substitutions live, as you type!

lua/plugins/codecompanion.lua

@@ -0,0 +1,74 @@
+return {
+  "olimorris/codecompanion.nvim",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "nvim-treesitter/nvim-treesitter",
+  },
+  opts = {
+    display = {
+      chat = {
+        window = {
+          layout = "vertical",
+          width = 0.35,
+          height = 0.35,
+        },
+        keymaps = {
+          close = {
+            modes = {
+              n = "q", -- Bind "q" in normal mode to close the chat
+            },
+            index = 1,
+            callback = "keymaps.close",
+            description = "Close Chat",
+          },
+        }
+      },
+    },
+    interactions = {
+      chat = {
+        adapter = "gemini_pro", -- Removed the curly braces
+      },
+      inline = {
+        adapter = "gemini_flash", -- Removed the curly braces
+      },
+    },
+    background = {
+      adapter = "ollama_bg", -- Pointed this to the new extended adapter string
+    },
+    adapters = {
+	    http = {
+      gemini_pro = function()
+        return require("codecompanion.adapters").extend("gemini", {
+          name = "gemini_pro",
+          schema = {
+            model = {
+              default = "gemini-3.5-flash",
+            },
+          },
+        })
+      end,
+      gemini_flash = function()
+        return require("codecompanion.adapters").extend("gemini", {
+          name = "gemini_flash",
+          schema = {
+            model = {
+              default = "gemini-2.0-flash",
+            },
+          },
+        })
+      end,
+      -- Added an extended Ollama adapter to fix your background task
+      ollama_bg = function()
+        return require("codecompanion.adapters").extend("ollama", {
+          name = "ollama_bg",
+          schema = {
+            model = {
+              default = "qwen-7b-instruct",
+            },
+          },
+        })
+      end,
+      },
+    },
+  }
+}

lua/plugins/remote.lua

@@ -1,7 +1,14 @@
 return {
-    'chipsenkbeil/distant.nvim',
-    branch = 'v0.3',
+      "amitds1997/remote-nvim.nvim",
+      version = "*", -- Pin to GitHub releases for stability
+      dependencies = {
+        "nvim-lua/plenary.nvim",
+        "nvim-telescope/telescope.nvim",
+        "MunifTanjim/nui.nvim",
+      },
       config = function()
-        require('distant'):setup()
+      	require("remote-nvim").setup({
+          ssh_config_file_paths = { vim.fn.expand("$HOME/.ssh/config") },
+      })
     end
     }