From ba4597d39075ae23c0b5e26d8f0def1a4078b565 Mon Sep 17 00:00:00 2001 From: finn Date: Thu, 5 Sep 2024 00:59:53 -0700 Subject: [PATCH] fix avante, consolidate minor ui --- lazy-lock.json | 18 +-- lua/plugins/avante.lua | 251 ++++++++++++++++------------------- lua/plugins/gruvbox.lua | 12 -- lua/plugins/my_ui_tweaks.lua | 17 +++ lua/plugins/tokyonight.lua | 3 - 5 files changed, 141 insertions(+), 160 deletions(-) delete mode 100644 lua/plugins/gruvbox.lua create mode 100644 lua/plugins/my_ui_tweaks.lua delete mode 100644 lua/plugins/tokyonight.lua diff --git a/lazy-lock.json b/lazy-lock.json index d14ae12..8de823f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,6 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" }, - "avante.nvim": { "branch": "main", "commit": "d520f0933323ba982c9665d8e4fe91000ff14e99" }, + "avante.nvim": { "branch": "main", "commit": "33c9ac216df66a39ec393aa29e1bc79e0c140319" }, + "beacon.nvim": { "branch": "master", "commit": "098ff96c33874339d5e61656f3050dbd587d6bd5" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, @@ -11,11 +12,11 @@ "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "899e993850084ea33d001ec229d237bc020c19ae" }, - "grug-far.nvim": { "branch": "main", "commit": "8058c2366f21af6f446d8e0f9333ae7c22f7679a" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" }, + "grug-far.nvim": { "branch": "main", "commit": "1d5dd56ba4037d1096dd9276579dd544035cd8bd" }, "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" }, "img-clip.nvim": { "branch": "main", "commit": "28a32d811d69042f4fa5c3d5fa35571df2bc1623" }, - "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, + "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, @@ -29,13 +30,14 @@ "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, - "nvim-lspconfig": { "branch": "master", "commit": "3ad562700d0615818bf358268ac8914f6ce2b079" }, + "nvim-lint": { "branch": "master", "commit": "a7ce9c78a7c710c28bee56dfab10a5c0c80b7fb5" }, + "nvim-lspconfig": { "branch": "master", "commit": "0ef64599b8aa0187ee5f6d92cb39c951f348f041" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-treesitter": { "branch": "master", "commit": "a1573a9135c608e68cb383f752623527be84bdce" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "3a3c6244553f13fdd92d312c82722b57ce6c4bec" }, + "nvim-treesitter": { "branch": "master", "commit": "3826d0c42ac635f560479b5b6ab522f6627a3466" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "fe3deb7f67ce0cc4ebfe2ea6c1c7ae1c7a939d73" }, "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "render-markdown.nvim": { "branch": "main", "commit": "2f9d4f0be8784ed4fef5960eb7b80bf60c5fdf56" }, diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua index b9e7dcd..f44ab06 100644 --- a/lua/plugins/avante.lua +++ b/lua/plugins/avante.lua @@ -1,147 +1,124 @@ return { - { - "yetone/avante.nvim", - event = "VeryLazy", - lazy = false, - opts = { - -- Hack to make local LLM work smoothly. Breaks claude entirely. - claude = { + "yetone/avante.nvim", + event = "VeryLazy", + lazy = false, + version = false, -- set this if you want to always pull the latest change + opts = { + claude = { + ["local"] = true, + }, + -- Begin opts + provider = "ol_llama", + vendors = { + ---@type AvanteProvider + ol_llama = { ["local"] = true, - }, - provider = "ol_llama", - vendors = { - ---@type AvanteProvider - ol_llama = { - ["local"] = true, - endpoint = "127.0.0.1:11434/v1", - model = "llama3.1:latest", - 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, - }, - ---@type AvanteProvider - ol_llama70b = { - ["local"] = true, - endpoint = "127.0.0.1:11434/v1", - model = "llama3.1:70b", - 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, - }, - ---@type AvanteProvider - ol_gemma = { - ["local"] = true, - endpoint = "127.0.0.1:11434/v1", - model = "codegemma", - 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, - }, - }, - -- add any opts here - }, - keys = { - { - "aa", - function() - require("avante.api").ask() - end, - desc = "avante: ask", - mode = { "n", "v" }, - }, - { - "ar", - function() - require("avante.api").refresh() - end, - desc = "avante: refresh", - }, - { - "ae", - function() - require("avante.api").edit() - end, - desc = "avante: edit", - mode = "v", - }, - }, - dependencies = { - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - --- The below dependencies are optional, - --"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons - "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, + endpoint = "127.0.0.1:11434/v1", + model = "llama3.1:latest", + parse_curl_args = function(opts, code_opts) + return { + url = opts.endpoint .. "/chat/completions", + headers = { + ["Accept"] = "application/json", + ["Content-Type"] = "application/json", }, - -- required for Windows users - use_absolute_path = true, + 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, + }, + ---@type AvanteProvider + ol_llama70b = { + ["local"] = true, + endpoint = "127.0.0.1:11434/v1", + model = "llama3.1:70b", + 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, + }, + ---@type AvanteProvider + ol_gemma = { + ["local"] = true, + endpoint = "127.0.0.1:11434/v1", + model = "codegemma", + 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, + }, + }, + -- add any opts here + }, + -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` + build = "make", + -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows + dependencies = { + "stevearc/dressing.nvim", + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim", + --- The below dependencies are optional, + "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons + --"zbirenbaum/copilot.lua", -- for providers='copilot' + { + -- 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, }, }, - { - -- Make sure to setup it properly if you have lazy=true - "MeanderingProgrammer/render-markdown.nvim", - opts = { - file_types = { "markdown", "Avante" }, - }, - ft = { "markdown", "Avante" }, + }, + { + -- Make sure to set this up properly if you have lazy=true + "MeanderingProgrammer/render-markdown.nvim", + opts = { + file_types = { "markdown", "Avante" }, }, + ft = { "markdown", "Avante" }, }, }, } diff --git a/lua/plugins/gruvbox.lua b/lua/plugins/gruvbox.lua deleted file mode 100644 index b546097..0000000 --- a/lua/plugins/gruvbox.lua +++ /dev/null @@ -1,12 +0,0 @@ -return { - -- add gruvbox - { "ellisonleao/gruvbox.nvim" }, - - -- Configure LazyVim to load gruvbox - { - "LazyVim/LazyVim", - opts = { - --colorscheme = "gruvbox", - }, - }, -} diff --git a/lua/plugins/my_ui_tweaks.lua b/lua/plugins/my_ui_tweaks.lua new file mode 100644 index 0000000..d3ff143 --- /dev/null +++ b/lua/plugins/my_ui_tweaks.lua @@ -0,0 +1,17 @@ +return { + -- Flash/fade cursor locator + { + "danilamihailov/beacon.nvim", + opts = { + speed = 1, + width = 30, + min_jump = 2, + }, + }, + + -- Darker bg in tokyonight + { "folke/tokyonight.nvim", opts = { style = "night" } }, + + -- Install gruvbox as option + { "ellisonleao/gruvbox.nvim" }, +} diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua deleted file mode 100644 index 30d3273..0000000 --- a/lua/plugins/tokyonight.lua +++ /dev/null @@ -1,3 +0,0 @@ -return { - { "folke/tokyonight.nvim", opts = { style = "night" } }, -}