From d067864ac31080f94216f3be0ad4a997f02b4678 Mon Sep 17 00:00:00 2001 From: hypercross Date: Sat, 16 Aug 2025 14:37:08 +0800 Subject: [PATCH] feat: modernize avante & mason issues? --- lazy-lock.json | 7 ++-- lua/plugins/avante.lua | 94 ++++-------------------------------------- 2 files changed, 10 insertions(+), 91 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2bd9d35..b92a94d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,7 @@ { "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, "SchemaStore.nvim": { "branch": "main", "commit": "b627e3fbad4fed4adc75d35988effbd6ce93b7b4" }, - "avante.nvim": { "branch": "main", "commit": "be0937a459624ce1170f158f9d8660d0ade47eb4" }, + "avante.nvim": { "branch": "main", "commit": "c1ccb7867a611412af398d5732a479fd598a39c3" }, "bamboo.nvim": { "branch": "master", "commit": "56c924d0cbd3a37f9d0ea1235a189a3cccde1f44" }, "blink-cmp-avante": { "branch": "master", "commit": "4f494c6e124acbe31a8f5d58effa0c14aa38a6d5" }, "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, @@ -20,13 +20,12 @@ "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, - "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "mini.ai": { "branch": "main", "commit": "1cd4f021a05c29acd4ab511c0981da14217daf38" }, "mini.icons": { "branch": "main", "commit": "b8f6fa6f5a3fd0c56936252edcd691184e5aac0c" }, "mini.pairs": { "branch": "main", "commit": "1e1ca3f60f58d4050bf814902b472eec9963a5dd" }, "mini.surround": { "branch": "main", "commit": "7a8606333affe7ce637a0ba91bbafc46fc42bfa0" }, - "minuet-ai.nvim": { "branch": "main", "commit": "9ba12416fd241d619e059b861811fb30366671c4" }, "neo-tree.nvim": { "branch": "main", "commit": "46fa0c22ca39e05fe15744102d21feb07fe9a94a" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua index 4d6c4fa..7d4c43a 100644 --- a/lua/plugins/avante.lua +++ b/lua/plugins/avante.lua @@ -1,50 +1,8 @@ -local function deepseek(model) - return { - __inherited_from = "openai", - api_key_name = "DEEPSEEK_API_KEY", - endpoint = "https://api.deepseek.com", - max_completion_tokens = 12288, - model = model, - } -end - local function qwen(model) return { __inherited_from = "openai", api_key_name = "QWEN_API_KEY", endpoint = "https://dashscope.aliyuncs.com/compatible-mode/v1/", - max_completion_tokens = 12288, - model = model, - disable_tools = true, - } -end - -local function yostar(model) - return { - __inherited_from = "openai", - api_key_name = "YOSTAR_API_KEY", - endpoint = "https://litellm.yostar.net", - max_completion_tokens = 12288, - model = model, - } -end - -local function codestral() - return { - __inherited_from = "openai", - api_key_name = "CODESTRAL_API_KEY", - endpoint = "https://codestral.mistral.ai/v1", - max_completion_tokens = 12288, - model = "codestral-latest", - } -end - -local function ark(model) - return { - __inherited_from = "openai", - api_key_name = "ARK_API_KEY", - endpoint = "https://ark.cn-beijing.volces.com/api/v3/", - max_completion_tokens = 12288, model = model, } end @@ -52,9 +10,9 @@ end return { { "yetone/avante.nvim", + build = vim.fn.has("win32") ~= 0 and "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" + or "make", event = "VeryLazy", - lazy = true, - build = "make", dependencies = { "stevearc/dressing.nvim", "nvim-lua/plenary.nvim", @@ -68,37 +26,17 @@ return { }, }, opts = { - provider = "arkv3", - auto_suggestions_provider = "arkv3", - -- cursor_applying_provider = "yoqwen32", - -- behaviour = { - -- enable_cursor_planning_mode = true, -- enable cursor planning mode! - -- }, - file_selector = { provider = "fzf-lua", provider_opts = {}, }, - vendors = { + provider = "qwen3coder", + auto_suggestions_provider = "qwen332b", - -- ds - dsv3 = deepseek("deepseek-chat"), - dsr1 = deepseek("deepseek-reasoner"), - - -- 百炼 - qwenv3 = qwen("deepseek-v3"), - qwenr1 = qwen("deepseek-r1"), - - -- yostar - yor1 = yostar("DeepSeek-R1"), - yov3 = yostar("DeepSeek-V3"), - - -- ark - arkv3 = ark("deepseek-v3-250324"), - - -- codestral - codestral = codestral(), + providers = { + qwen3coder = qwen("qwen3-coder-480b-a35b-instruct"), + qwen332b = qwen("qwen3-32b"), }, -- Key mappings for diff functionality @@ -171,22 +109,4 @@ return { }, }, }, - { - "milanglacier/minuet-ai.nvim", - event = "InsertEnter", - config = function() - require("minuet").setup({ - virtualtext = { - auto_trigger_ft = { "*" }, - keymap = { - accept = "", - accept_line = "", - next = "", - prev = "", - dismiss = "", - }, - }, - }) - end, - }, }