diff --git a/.config/nvim/after/plugin/codecompanion.lua b/.config/nvim/after/plugin/codecompanion.lua index 97893b6..3d76eb2 100644 --- a/.config/nvim/after/plugin/codecompanion.lua +++ b/.config/nvim/after/plugin/codecompanion.lua @@ -23,38 +23,17 @@ require('codecompanion').setup({ auth_method = "chatgpt" }, }) + end, + claude_code = function() + return require("codecompanion.adapters").extend("claude_code", { }) end } }, strategies = { chat = { - adapter = "webui", - tools = { - ["cmd_runner"] = { auto_submit_errors = true }, - ["editor"] = { auto_submit_success = false }, - ["files"] = { auto_submit_success = true } - } + adapter = "claude_code", }, - agent = { - adapter = "webui", - }, - opts = { - system_prompt = [[ - You are an expert coding assistant operating in agent mode. - When asked about files or code, ALWAYS use the available tools to: - - Read files with the `files` tool before answering questions about them - - Use the `editor` tool to read the current buffer - - Use `cmd_runner` to run tests or shell commands when relevant - Never ask the user to paste file contents — fetch them yourself using tools. - ]], - } }, - interactions = { - chat = { - adapter = "webui", - model = "qwen3.5:9b", - }, - } }) vim.keymap.set('n', 'gpt', function() require("codecompanion").chat({strategy = "agent" }) end); diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua index 0f56c96..9f66165 100644 --- a/.config/nvim/after/plugin/lspconfig.lua +++ b/.config/nvim/after/plugin/lspconfig.lua @@ -4,7 +4,24 @@ capabilities.textDocument.completion.completionItem.snippetSupport = true vim.lsp.config("*", { capabilities = capabilities }) --- vim.lsp.config("ts_ls", {}) + +local project_library_path = vim.fn.getcwd() .. '/node_modules' +local angular_cmd = { + 'ngserver', + '--stdio', + '--tsProbeLocations', + project_library_path, + '--ngProbeLocations', + project_library_path .. '@angular/language-server' +} + +vim.lsp.config("ts_ls", {}) +vim.lsp.config("angularls", { + cmd = angular_cmd, + on_new_config = function(new_config, new_root_dir) + new_config.cmd = angular_cmd + end +}) vim.lsp.config("ruff", {}) vim.lsp.config("cssls", {}) vim.lsp.config("lua_ls", {}) @@ -30,7 +47,7 @@ vim.lsp.config("eslint", { }, }) -vim.lsp.enable({"odoo_ls", "hls", "ruff", "eslint", "cssls", "lua_ls", "lemminx"}) +vim.lsp.enable({"angularls", "odoo_ls", "hls", "ruff", "eslint", "cssls", "lua_ls", "lemminx"}) vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('user_lsp_attach', { clear = true }), diff --git a/.config/nvim/after/plugin/nvim-http.lua b/.config/nvim/after/plugin/nvim-http.lua deleted file mode 100644 index 0f25ad6..0000000 --- a/.config/nvim/after/plugin/nvim-http.lua +++ /dev/null @@ -1 +0,0 @@ -require("nvim_http").setup() diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 6c2559e..b416fb8 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -1,4 +1,4 @@ -require 'nvim-treesitter.configs'.setup { +require 'nvim-treesitter.config'.setup { -- A list of parser names, or "all" (the listed parsers MUST always be installed) ensure_installed = { "vimdoc", diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index a61585f..179bc88 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,44 +1,42 @@ { - "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" }, + "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "codecompanion.nvim": { "branch": "main", "commit": "558518f8d78a44198cd428f6bf8bf48bfa38d76d" }, "dashboard-nvim": { "branch": "master", "commit": "0775e567b6c0be96d01a61795f7b64c1758262f6" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "everforest-nvim": { "branch": "main", "commit": "557bce922401e247a596583679bc181d4d688554" }, + "everforest-nvim": { "branch": "main", "commit": "323e7633034a8068636a11597cec03bca5465c50" }, "gitlinker.nvim": { "branch": "master", "commit": "bbe2a1254fc8fce21f3bbf9a020266a1c49799f7" }, - "gitsigns.nvim": { "branch": "main", "commit": "6d72ba88c40f4c55c01f8a0558aa532cee108486" }, + "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" }, "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" }, - "hererocks": { "branch": "master", "commit": "3db37265c3839cbd4d27fc73f92fa7b58bc3a76f" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" }, - "neogit": { "branch": "master", "commit": "7073f3aafc9030d457838995106784a9d1873b3b" }, + "neogit": { "branch": "master", "commit": "d3890fc3cdf0859845a86b2be306bba01458df1a" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, - "nvim-dap": { "branch": "master", "commit": "b516f20b487b0ac6a281e376dfac1d16b5040041" }, + "nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" }, "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-http": { "branch": "main", "commit": "70016196c103a6a8e805c2982b48e1d01c6b348b" }, - "nvim-lspconfig": { "branch": "master", "commit": "2b87d107942b9eebef768512f5849330335a9493" }, + "nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" }, - "nvim-treesitter": { "branch": "main", "commit": "1970f0d3bbb99c7659e58914948749437c7b7398" }, - "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" }, - "obsidian.nvim": { "branch": "main", "commit": "eb2dde1e164ffcfba51216262bc43b9ed52da046" }, + "nvim-treesitter": { "branch": "main", "commit": "e5f65e31a5ec0e8526b2311ff8c7aaea4a581c82" }, + "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, + "obsidian.nvim": { "branch": "main", "commit": "57aeab47db861f2ec17b8b9a01d0305bca48b5a9" }, "odoo-neovim": { "branch": "main", "commit": "882aeb9bc0d6302cb99aa1235abe4820532fd416" }, "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "907505549edc2f90c82fc429348af03ee8c3a825" }, - "roslyn.nvim": { "branch": "main", "commit": "7deb9bb5b6afcb3c03c70741c6d364ffd8b59bda" }, + "render-markdown.nvim": { "branch": "main", "commit": "e3c18ddd27a853f85a6f513a864cf4f2982b9f26" }, + "roslyn.nvim": { "branch": "main", "commit": "ff43201090361b8936e008a006473b59ef2c0ca6" }, "smear-cursor.nvim": { "branch": "main", "commit": "c85bdbb25db096fbcf616bc4e1357bd61fe2c199" }, - "snacks.nvim": { "branch": "main", "commit": "9912042fc8bca2209105526ac7534e9a0c2071b2" }, + "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, - "undotree": { "branch": "master", "commit": "d8f99084d98c32f651860eb0baaf89759f91debc" }, + "undotree": { "branch": "master", "commit": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d" }, "vim-projectionist": { "branch": "master", "commit": "5ff7bf79a6ef741036d2038a226bcb5f8b1cd296" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } } diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua index 3a49c69..1b3e420 100644 --- a/.config/nvim/lua/wicked/lazy.lua +++ b/.config/nvim/lua/wicked/lazy.lua @@ -47,21 +47,16 @@ require("lazy").setup({ { "olimorris/codecompanion.nvim", version = "^18.0.0", - opts = {}, + opts = { + opts = { + log_level = "TRACE", + }, + }, dependencies = { "nvim-lua/plenary.nvim", "nvim-treesitter/nvim-treesitter", }, }, - { - name = "nvim-http", - dir = "~/Projects/nvim-http", - dependencies = { - "nvim-lua/plenary.nvim", - "nvim-telescope/telescope.nvim", - }, - build = "rockspec", - }, 'tpope/vim-surround', 'seblyng/roslyn.nvim', 'nvim-telescope/telescope-ui-select.nvim',