Skip to content

Commit

Permalink
chore: changed few bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
shubham-cpp committed Dec 7, 2024
1 parent ed7f7b1 commit a0cd592
Show file tree
Hide file tree
Showing 15 changed files with 222 additions and 321 deletions.
6 changes: 3 additions & 3 deletions .config/nvim-lazy/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"NeoTerm.lua": { "branch": "main", "commit": "f71a4a9663c52673a677a09894d945983c8da303" },
"SchemaStore.nvim": { "branch": "main", "commit": "f922d46e17019e7fcadc1f0c1cfba31e8300819a" },
"auto-session": { "branch": "main", "commit": "021b64ed7d4ac68a37be3ad28d8e1cba5bec582c" },
"avante.nvim": { "branch": "main", "commit": "57311bf8cd2f48729565d2351bcbf383b6a56907" },
"bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" },
"bullets.vim": { "branch": "master", "commit": "2253f970e54320dbd76fd6bb4f5a0bf2436ce232" },
"catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
Expand All @@ -15,20 +14,20 @@
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-rg": { "branch": "master", "commit": "70a43543f61b6083ba9c3b7deb9ccee671410ac6" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"codecompanion.nvim": { "branch": "main", "commit": "1848048ae804097538c8b58269fe28d58f953453" },
"conform.nvim": { "branch": "master", "commit": "a203480a350b03092e473bf3001733d547160a73" },
"copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
"crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
"dial.nvim": { "branch": "master", "commit": "46b4375e84e8eb771129bff6b2b1e47746601ef9" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"dooing": { "branch": "main", "commit": "4d78066b88b808d4c50966bca20985c136b2a654" },
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" },
"grug-far.nvim": { "branch": "main", "commit": "9a2f78219390b47d67795ab09390d7f092e23976" },
"gx.nvim": { "branch": "main", "commit": "b01db725a001e4215f363159fc04727f6fde0a1c" },
"img-clip.nvim": { "branch": "main", "commit": "5ff183655ad98b5fc50c55c66540375bbd62438c" },
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
Expand All @@ -42,6 +41,7 @@
"mini.align": { "branch": "main", "commit": "26111a737494bc39576ad67b52bbc2638ca23553" },
"mini.icons": { "branch": "main", "commit": "54686be7d58807906cb2c8c2216e0bf9c044f19a" },
"mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" },
"mini.operators": { "branch": "main", "commit": "35b12f54bd5acb860f4297fd6d12fd07b1b065e2" },
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
"mini.surround": { "branch": "main", "commit": "48a9795c9d352c771e1ab5dedab6063c0a2df037" },
"neo-tree.nvim": { "branch": "main", "commit": "42caaf5c3b7ca346ab278201151bb878006a6031" },
Expand Down
1 change: 1 addition & 0 deletions .config/nvim-lazy/lua/config/lazy.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ require("lazy").setup({

-- import/override with your plugins
{ import = "plugins" },
{ import = "plugins.ai" },
{ import = "plugins.lsp" },
{ import = "plugins.mini" },
},
Expand Down
161 changes: 0 additions & 161 deletions .config/nvim-lazy/lua/plugins/ai.lua

This file was deleted.

131 changes: 89 additions & 42 deletions .config/nvim-lazy/lua/plugins/ai/avante.lua
Original file line number Diff line number Diff line change
@@ -1,55 +1,102 @@
---@type LazySpec
return {
"olimorris/codecompanion.nvim",
cmd = {
"CodeCompanion",
"CodeCompanionChat",
"CodeCompanionCmd",
"CodeCompanionActions",
},
"yetone/avante.nvim",
version = false,
build = "make",
keys = {
{ "<leader>cc", "<cmd>CodeCompanionChat toggle<CR>", desc = "Chat Toggle", mode = { "n", "x" } },
{ "<leader>cA", "<cmd>CodeCompanionChat add<CR>", desc = "Chat Add Selection", mode = "x" },
{ "<leader>ca", "<cmd>CodeCompanionActions<CR>", desc = "Chat Actions", mode = { "n", "x" } },
{ "<leader>cd", "<cmd>CodeCompanionCmd<space>/", desc = "Chat Cmd" },
{ "<leader>a", "", mode = { "n", "x" }, desc = "+avante" },
{ "<leader>aa", mode = { "n", "x" }, desc = "Ask" },
{ "<leader>ae", mode = { "n", "x" }, desc = "Edit" },
},
opts = function()
vim.env.GEMINI_API_KEY = require("config.m-utils").get_age_credentials("gemini_api.age")
local ollama_setup = {
-- add any opts here
---@type Provider
provider = "gemini",
vendors = {
---@type AvanteProvider
ollama = {
["local"] = true,
endpoint = "127.0.0.1:11434/v1",
model = "llama3.2",
parse_curl_args = function(opts, code_opts)
return {
url = opts.endpoint .. "/chat/completions",
headers = {
["Accept"] = "application/json",
["Content-Type"] = "application/json",
},
body = {
model = opts.model,
messages = require("avante.providers").copilot.parse_message(code_opts), -- you can make your own message, but this is very advanced
max_tokens = 2048,
stream = true,
},
}
end,
parse_response_data = function(data_stream, event_state, opts)
require("avante.providers").openai.parse_response(data_stream, event_state, opts)
end,
},
},
}
if not vim.env.GEMINI_API_KEY then
return ollama_setup
end
return {
---@type Provider
provider = "gemini",
}
end,
dependencies = {
"nvim-lua/plenary.nvim",
-- 'KingMichaelPark/age.nvim', -- Add age dependency
{ dir = "~/Downloads/GitClones/age.nvim" }, -- Add age dependency
"nvim-treesitter/nvim-treesitter",
"KingMichaelPark/age.nvim",
{
"MeanderingProgrammer/render-markdown.nvim",
"stevearc/dressing.nvim",
opts = {
file_types = { "markdown", "Avante", "codecompanion" },
select = {
-- Priority list of preferred vim.select implementations
backend = { "telescope", "fzf_lua", "fzf", "builtin", "nui" },
-- Options for fzf-lua
fzf_lua = {
winopts = {
height = 0.5,
width = 0.8,
},
},
},
},
ft = { "markdown", "Avante", "codecompanion" },
},
},
config = function()
require("codecompanion").setup({
display = { chat = { render_headers = false } },
strategies = {
--NOTE: Change the adapter as required
chat = { adapter = "openai_compatible" },
inline = { adapter = "openai_compatible" },
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
--- The below dependencies are optional,
"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
{
-- support for image pasting
"HakonHarnes/img-clip.nvim",
event = "VeryLazy",
opts = {
-- recommended settings
default = {
embed_image_as_base64 = false,
prompt_for_file_name = false,
drag_and_drop = {
insert_mode = true,
},
-- required for Windows users
use_absolute_path = true,
},
},
adapters = {
openai_compatible = function()
return require("codecompanion.adapters").extend("openai_compatible", {
env = {
url = "https://glhf.chat",
api_key = function()
require("m-utils").get_age_credentials("glhf.age")
end,
chat_url = "/api/openai/v1/chat/completions",
},
schema = {
model = { default = "hf:Qwen/Qwen2.5-Coder-32B-Instruct" },
num_ctx = { default = 32768 },
},
})
end,
},
{
-- Make sure to set this up properly if you have lazy=true
"MeanderingProgrammer/render-markdown.nvim",
opts = {
file_types = { "markdown", "Avante" },
},
})
end,
ft = { "markdown", "Avante" },
},
},
}
Loading

0 comments on commit a0cd592

Please sign in to comment.