From 9aac0e4dc093b1430265e9bcee57908cf5c9ea05 Mon Sep 17 00:00:00 2001 From: sudacode Date: Thu, 7 Aug 2025 21:50:36 -0700 Subject: [PATCH] update nvim config and squash some bugs --- .config/nvim/lua/core/keymaps.lua | 2 +- .config/nvim/lua/plugins/codecompanion.lua | 6 ++++++ .config/nvim/lua/plugins/lsp_lines.lua | 9 +++++++++ .config/nvim/lua/plugins/lspconfig.lua | 4 ++-- .config/nvim/lua/plugins/noice.lua | 2 +- .config/nvim/lua/utils/extensions/telescope/init.lua | 2 +- .../nvim/lua/utils/keymaps/converters/whichkey/init.lua | 3 ++- 7 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 .config/nvim/lua/plugins/lsp_lines.lua diff --git a/.config/nvim/lua/core/keymaps.lua b/.config/nvim/lua/core/keymaps.lua index f4c2875..57000d7 100644 --- a/.config/nvim/lua/core/keymaps.lua +++ b/.config/nvim/lua/core/keymaps.lua @@ -12,8 +12,8 @@ local nosilent = { noremap = true } vim.g.mapleader = " " vim.g.maplocalleader = "," +-- Create a custom command with the given trigger, command, and description function create_custom_command(trigger, command, description) - -- Create a custom command with the given trigger, command, and description vim.api.nvim_create_user_command(trigger, command, { desc = description }) end -- Custom commands diff --git a/.config/nvim/lua/plugins/codecompanion.lua b/.config/nvim/lua/plugins/codecompanion.lua index eb8f1dd..c0c4734 100644 --- a/.config/nvim/lua/plugins/codecompanion.lua +++ b/.config/nvim/lua/plugins/codecompanion.lua @@ -14,6 +14,12 @@ return { name = "copilot", opts = { stream = true, + tools = true, + vision = true, + }, + features = { + text = true, + tokens = true, }, model = { -- default = "claude-3.7-sonnet-thought", diff --git a/.config/nvim/lua/plugins/lsp_lines.lua b/.config/nvim/lua/plugins/lsp_lines.lua new file mode 100644 index 0000000..521386b --- /dev/null +++ b/.config/nvim/lua/plugins/lsp_lines.lua @@ -0,0 +1,9 @@ +return { + "https://git.sr.ht/~whynothugo/lsp_lines.nvim", + config = function() + -- lsp_lines + vim.diagnostic.config({ virtual_text = false }) + -- -- + vim.keymap.set("", "tl", require("lsp_lines").toggle, { desc = "Toggle lsp_lines" }) + end, +} diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index fd1e3cb..cb66797 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -38,7 +38,6 @@ return { for _, lsp in ipairs(servers) do if lsp == "lua_ls" then - vim.lsp.enable(lsp) vim.lsp.config("lua_ls", { on_init = function(client) if client.workspace_folders then @@ -76,8 +75,8 @@ return { }, handlers = {}, }) - elseif lsp == "basedpyright" then vim.lsp.enable(lsp) + elseif lsp == "basedpyright" then vim.lsp.config(lsp, { analysis = { autoSearchPaths = true, @@ -89,6 +88,7 @@ return { callArgumentNames = true, }, }) + vim.lsp.enable(lsp) else vim.lsp.enable(lsp) -- vim.lsp.config(lsp, { diff --git a/.config/nvim/lua/plugins/noice.lua b/.config/nvim/lua/plugins/noice.lua index 536fd2c..59f6a94 100644 --- a/.config/nvim/lua/plugins/noice.lua +++ b/.config/nvim/lua/plugins/noice.lua @@ -72,7 +72,7 @@ return { views = { cmdline_popup = { border = { - style = "none", + style = "rounded", padding = { 0, 0 }, }, filter_options = {}, diff --git a/.config/nvim/lua/utils/extensions/telescope/init.lua b/.config/nvim/lua/utils/extensions/telescope/init.lua index 48dadf7..89e32b6 100644 --- a/.config/nvim/lua/utils/extensions/telescope/init.lua +++ b/.config/nvim/lua/utils/extensions/telescope/init.lua @@ -1,5 +1,5 @@ local ts = require("telescope") -ts.load_extension("fzf") +-- ts.load_extension("fzf") ts.load_extension("color_names") ts.load_extension("file_browser") ts.load_extension("glyph") diff --git a/.config/nvim/lua/utils/keymaps/converters/whichkey/init.lua b/.config/nvim/lua/utils/keymaps/converters/whichkey/init.lua index 102754e..2a5f2bf 100644 --- a/.config/nvim/lua/utils/keymaps/converters/whichkey/init.lua +++ b/.config/nvim/lua/utils/keymaps/converters/whichkey/init.lua @@ -19,8 +19,9 @@ function M.addToWhichKey(mappings, group) elseif not mappings and group then return end + local wk_mappings = {} for _, mapping in ipairs(mappings) do - local wk_mappings = {} + wk_mappings = {} if not mapping.key or mapping.key == "" then vim.notify("Error: Key is empty or nil", "error") return