From 025ff1e65776e4e46e891fb97e92f320ae5cfbde Mon Sep 17 00:00:00 2001 From: Dmitrii Chumak Date: Tue, 24 Feb 2026 13:00:06 +0300 Subject: [PATCH] [nvim] codecompanion removed, added starpls --- nvim/lazy-lock.json | 28 ++++++----- nvim/lsp/starpls.lua | 5 ++ nvim/lua/lsp-config.lua | 3 +- nvim/lua/plugins/codecompanion.lua | 74 +++++++++++++++--------------- nvim/lua/plugins/init.lua | 39 +++++++++++----- 5 files changed, 84 insertions(+), 65 deletions(-) create mode 100644 nvim/lsp/starpls.lua diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index c8dec21..014530f 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,21 +1,19 @@ { - "LuaSnip": { "branch": "master", "commit": "3d5bced1b9ae69fa3f9b1942e28af5dbc537f946" }, - "avante.nvim": { "branch": "main", "commit": "2fc63d4128d2dc2fef0913c7480b4586959ebe4e" }, + "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" }, + "avante.nvim": { "branch": "main", "commit": "e89eb79abf5754645e20aa6074da10ed20bba33c" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, - "codecompanion.nvim": { "branch": "main", "commit": "e23e8e5a5643b089607f21f576f6e63174cc44dc" }, - "fzf-lua": { "branch": "main", "commit": "4ee42b241e57b77b4f3c61a018f496219f246901" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, + "fzf-lua": { "branch": "main", "commit": "a8458b79a957a6e3e217d84106a0fd4b9470ff4c" }, "github-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "bb3a17efc797c34c054463174e5522442576ebd8" }, - "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "3590d66effccc7376d8c3dbe45e8291f9fed2843" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "outline.nvim": { "branch": "main", "commit": "0eb9289ab39c91caf8b3ed0e3a17764809d69558" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "7bf55ed0ff5be182ad3301cff266581fc1c56cce" }, + "nvim-cmp": { "branch": "main", "commit": "a7bcf1d88069fc67c9ace8a62ba480b8fe879025" }, + "outline.nvim": { "branch": "main", "commit": "6b62f73a6bf317531d15a7ae1b724e85485d8148" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/nvim/lsp/starpls.lua b/nvim/lsp/starpls.lua new file mode 100644 index 0000000..33c748b --- /dev/null +++ b/nvim/lsp/starpls.lua @@ -0,0 +1,5 @@ +return { + cmd = { 'starpls' }, + filetypes = { 'starlark' }, + root_markers = { 'WORKSPACE' }, +} diff --git a/nvim/lua/lsp-config.lua b/nvim/lua/lsp-config.lua index 30edaa8..bb3f704 100644 --- a/nvim/lua/lsp-config.lua +++ b/nvim/lua/lsp-config.lua @@ -3,7 +3,7 @@ require("mason-lspconfig").setup({ ensure_installed = { 'lua_ls', 'gopls', - 'bashls', + 'bashls', -- install "shfmt" binary for formatting capabilities 'basedpyright', }, automatic_installation = true, @@ -73,3 +73,4 @@ vim.lsp.enable("lua_ls") vim.lsp.enable("bashls") vim.lsp.enable("gopls") vim.lsp.enable("basedpyright") +vim.lsp.enable("starpls") diff --git a/nvim/lua/plugins/codecompanion.lua b/nvim/lua/plugins/codecompanion.lua index 7c1b4f6..4fcc405 100644 --- a/nvim/lua/plugins/codecompanion.lua +++ b/nvim/lua/plugins/codecompanion.lua @@ -1,37 +1,37 @@ -require("codecompanion").setup({ - strategies = { - chat = { - adapter = "deepseek", - }, - inline = { - adapter = "deepseek", - }, - cmd = { - adapter = "deepseek", - } - }, - adapters = { - deepseek = function() - return require("codecompanion.adapters").extend("deepseek", { - env = { - api_key = (function() - local path = os.getenv("HOME") .. "/.config/deepseek_api_key" - local file = io.open(path, "r") - if not file then - vim.notify("Deepseek API key not found at " .. path, vim.log.levels.WARN) - return nil - end - local content = file:read("*a"):gsub("%s+", "") - file:close() - return content - end)(), - }, - schema = { - model = { - default = "deepseek-chat", - }, - }, - }) - end, - }, -}) +-- require("codecompanion").setup({ +-- strategies = { +-- chat = { +-- adapter = "deepseek", +-- }, +-- inline = { +-- adapter = "deepseek", +-- }, +-- cmd = { +-- adapter = "deepseek", +-- } +-- }, +-- adapters = { +-- deepseek = function() +-- return require("codecompanion.adapters").extend("deepseek", { +-- env = { +-- api_key = (function() +-- local path = os.getenv("HOME") .. "/.config/deepseek_api_key" +-- local file = io.open(path, "r") +-- if not file then +-- vim.notify("Deepseek API key not found at " .. path, vim.log.levels.WARN) +-- return nil +-- end +-- local content = file:read("*a"):gsub("%s+", "") +-- file:close() +-- return content +-- end)(), +-- }, +-- schema = { +-- model = { +-- default = "deepseek-chat", +-- }, +-- }, +-- }) +-- end, +-- }, +-- }) diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index a147520..41e8d7e 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -24,9 +24,9 @@ local plugins = { -- ... }) - -- vim.cmd('colorscheme github_light_colorblind') + vim.cmd('colorscheme github_light_colorblind') -- vim.cmd('colorscheme github_light') - vim.cmd('colorscheme github_dark_colorblind') + -- vim.cmd('colorscheme github_dark_colorblind') -- vim.cmd('colorscheme github_dark') end, }, @@ -79,14 +79,14 @@ local plugins = { -- Your setup opts here }, }, - { - "olimorris/codecompanion.nvim", - opts = {}, - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-treesitter/nvim-treesitter", - }, - }, + -- { + -- "olimorris/codecompanion.nvim", + -- opts = {}, + -- dependencies = { + -- "nvim-lua/plenary.nvim", + -- "nvim-treesitter/nvim-treesitter", + -- }, + -- }, { "yetone/avante.nvim", build = vim.fn.has("win32") ~= 0 @@ -97,13 +97,28 @@ local plugins = { ---@module 'avante' ---@type avante.Config opts = { - provider = "yadeepseek", + provider = "yaqwencode", providers = { yadeepseek = { __inherited_from = "openai", api_key_name = "cmd:cat ~/.config/eliza_api_key", endpoint = "https://api.eliza.yandex.net/raw/internal/deepseek/v1", model = "deepseek-0324", + use_ReAct_prompt = true, + }, + yaqwencode = { + __inherited_from = "openai", + api_key_name = "cmd:cat ~/.config/eliza_api_key", + endpoint = "https://api.eliza.yandex.net/raw/internal/qwen3-coder-480b-a35b-runtime/v1", + model = "qwen3-coder-480b-a35b-runtime", + use_ReAct_prompt = true, + }, + yaclaude = { + __inherited_from = "openai", + api_key_name = "cmd:cat ~/.config/eliza_api_key", + endpoint = "https://api.eliza.yandex.net/raw/anthropic/v1", + model = "claude-opus-4-5-20251101", + -- use_ReAct_prompt = true, }, }, }, @@ -131,4 +146,4 @@ vim.cmd([[ require("plugins/telescope") require("plugins/completions") require("plugins/gitsigns") -require("plugins/codecompanion") +-- require("plugins/codecompanion")