From bce85fa1a7130e4296b77f89888a133441ce2a45 Mon Sep 17 00:00:00 2001 From: Michael Chalupiak Date: Sun, 17 Aug 2025 14:17:37 -0400 Subject: [PATCH] move nvim config --- config/.config/nvim/lua/config/init.lua | 1 + config/.config/nvim/lua/config/keymap.lua | 2 + config/.config/nvim/lua/config/lsp.lua | 47 +++++++++++++++++++++-- config/.config/nvim/lua/plugins/lsp.lua | 9 +++++ 4 files changed, 55 insertions(+), 4 deletions(-) diff --git a/config/.config/nvim/lua/config/init.lua b/config/.config/nvim/lua/config/init.lua index c37cf28..d754968 100644 --- a/config/.config/nvim/lua/config/init.lua +++ b/config/.config/nvim/lua/config/init.lua @@ -1,3 +1,4 @@ require 'config.lazy' require 'config.set' require 'config.keymap' +require 'config.lsp' diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua index 31eec76..27855fc 100644 --- a/config/.config/nvim/lua/config/keymap.lua +++ b/config/.config/nvim/lua/config/keymap.lua @@ -29,6 +29,8 @@ setnx('oT', 'tabnew', 'Open new tab') setnx('of', 'enew', 'Open new file') setnx('ow', 'Telescope workspaces', 'Open workspace') setnx('ol', 'Lazy', 'Open Lazy') +setnx('om', 'Mason', 'Open Mason') +setnx('oc', 'cd' .. vim.fn.stdpath('config') .. 'Oil', 'Open neovim configuration') -- Exit terminal mode with ESC set('t', '', '') diff --git a/config/.config/nvim/lua/config/lsp.lua b/config/.config/nvim/lua/config/lsp.lua index 20439a6..e284bae 100644 --- a/config/.config/nvim/lua/config/lsp.lua +++ b/config/.config/nvim/lua/config/lsp.lua @@ -1,9 +1,48 @@ vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('UserLspConfig', {}), callback = function(args) - local client = vim.lsp.get_client_by_id(args.data.client_id) - if client.server_capabilities.inlayHintProvider then - vim.lsp.inlya_hint.enable(args.buf, true) - end + local client = vim.lsp.get_client_by_id(args.data.client_id) + if client:supports_method('textDocument/inlayHint') or client.server_capabilities.inlayHintProvider then + vim.lsp.inlay_hint.enable(true, { bufnr = args.buf }) + end end }) + +-- vim.lsp.config('rust-analyzer', { +-- settings = { +-- ["rust-analyzer"] = { +-- inlayHints = { +-- bindingModeHints = { +-- enable = false, +-- }, +-- chainingHints = { +-- enable = true, +-- }, +-- closingBraceHints = { +-- enable = true, +-- minLines = 25, +-- }, +-- closureReturnTypeHints = { +-- enable = "never", +-- }, +-- lifetimeElisionHints = { +-- enable = "never", +-- useParameterNames = false, +-- }, +-- maxLength = 25, +-- parameterHints = { +-- enable = true, +-- }, +-- reborrowHints = { +-- enable = "never", +-- }, +-- renderColons = true, +-- typeHints = { +-- enable = true, +-- hideClosureInitialization = false, +-- hideNamedConstructor = false, +-- }, +-- }, +-- } +-- } +-- }) diff --git a/config/.config/nvim/lua/plugins/lsp.lua b/config/.config/nvim/lua/plugins/lsp.lua index 3eb0f00..f6552db 100644 --- a/config/.config/nvim/lua/plugins/lsp.lua +++ b/config/.config/nvim/lua/plugins/lsp.lua @@ -18,6 +18,15 @@ return { }, }, + -- { + -- "MysticalDevil/inlay-hints.nvim", + -- event = "LspAttach", + -- dependencies = { "neovim/nvim-lspconfig" }, + -- config = function() + -- require("inlay-hints").setup() + -- end + -- }, + -- { 'saghen/blink.cmp', -- optional: provides snippets for the snippet source