diff options
Diffstat (limited to 'nvim')
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/filetype.lua | 2 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/keymaps.lua | 10 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/tobyvin/lsp/configs.lua | 24 |
3 files changed, 34 insertions, 2 deletions
diff --git a/nvim/.config/nvim/lua/tobyvin/filetype.lua b/nvim/.config/nvim/lua/tobyvin/filetype.lua index d259ba6..6fcb185 100644 --- a/nvim/.config/nvim/lua/tobyvin/filetype.lua +++ b/nvim/.config/nvim/lua/tobyvin/filetype.lua @@ -30,6 +30,8 @@ vim.filetype.add({ [".*/mutt/.*%.rc"] = "muttrc", -- goimapnotify [".*/goimapnotify/.*%.conf"] = "json", + -- i3blocks + [".*/i3blocks/config"] = "confini", -- conf fallback [".*%.conf"] = { "confini", { priority = -math.huge } }, -- sudoedit/sudo -e match original ft diff --git a/nvim/.config/nvim/lua/tobyvin/keymaps.lua b/nvim/.config/nvim/lua/tobyvin/keymaps.lua index a26aa5a..562c43c 100644 --- a/nvim/.config/nvim/lua/tobyvin/keymaps.lua +++ b/nvim/.config/nvim/lua/tobyvin/keymaps.lua @@ -13,6 +13,16 @@ vim.keymap.set("v", "<a-j>", ":move '>+1<cr>gv=gv", { desc = "move +" }) vim.keymap.set("t", "<c-w>", [[<c-\><c-n><c-w>]], { desc = "CTRL-W" }) +-- TODO: remove once default binds are established +-- Ref: https://github.com/neovim/neovim/issues/28634 +-- Ref: https://github.com/neovim/neovim/pull/28649 +vim.keymap.set("n", "crn", vim.lsp.buf.rename, { desc = "vim.lsp.buf.rename()" }) +vim.keymap.set("n", "crr", vim.lsp.buf.code_action, { desc = "vim.lsp.buf.code_action()" }) +vim.keymap.set("x", "<C-R>r", vim.lsp.buf.code_action, { desc = "vim.lsp.buf.code_action()" }) +vim.keymap.set("x", "<C-R><C-R>", vim.lsp.buf.code_action, { desc = "vim.lsp.buf.code_action()" }) +vim.keymap.set("n", "gr", vim.lsp.buf.references, { desc = "vim.lsp.buf.references()" }) +vim.keymap.set("i", "<C-S>", vim.lsp.buf.signature_help, { desc = "vim.lsp.buf.signature_help()" }) + vim.keymap.set("o", "o", function() local cursor = vim.fn.winsaveview() vim.cmd.normal({ "ggVG", bang = true, mods = { keepjumps = true } }) diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua index fd3735b..e36213a 100644 --- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua +++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua @@ -54,6 +54,7 @@ local M = { "htmldjango", }, }, + -- jedi_language_server = {}, jinja_lsp = {}, lemminx = { settings = { @@ -89,7 +90,20 @@ local M = { }, }, powershell_es = {}, - pylsp = {}, + pyright = { + settings = { + pyright = { + disableOrganizeImports = true, + }, + python = { + analysis = { + autoSearchPaths = true, + diagnosticMode = "workspace", + useLibraryCodeForTypes = true, + }, + }, + }, + }, rust_analyzer = { standalone = true, settings = { @@ -124,7 +138,13 @@ local M = { }, }, }, - ruff_lsp = {}, + ruff_lsp = { + on_attach = function(client) + if client.name == "ruff_lsp" then + client.server_capabilities.hoverProvider = false + end + end, + }, taplo = {}, texlab = { settings = { |