fix: Several small updates.

- Removing the load_lauunchjs call for dap as it's no longer needed.
- Cleanup of lspconfig of several lines that appear to not do anything
  in testing, and updating keymap order.
- Removing the luasnip setup section as it appears to not be required in
  testing.
- Update to nvim-cmp for luasnip relative loading and removing the
  buffer from command mode completion
- Twilight update to narrow the focus but also expand out if statements.
- ZSH re-enabling keychain despite it being slow as replacement with
  gpg-agent will take a focused session to do across environments
This commit is contained in:
2026-04-02 06:29:20 -05:00
parent fe487f2a90
commit 7b64bb09ac
6 changed files with 13 additions and 34 deletions

View File

@@ -1,9 +1,6 @@
return {
'neovim/nvim-lspconfig',
config = function()
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
vim.diagnostic.config({
virtual_text = {
source = 'always',
@@ -14,19 +11,12 @@ return {
}
})
vim.lsp.config('*', {
capabilities = capabilities, -- TODO: Does this do anything?
})
-- Auto set keymaps and other settings on LSP attach
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('my.lsp', {}),
callback = function(args)
local bufnr = args.buf
-- TODO: Does this do anything?
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Keyboard Mappings
local bufopts = { noremap = true, silent = true, buffer = bufnr }
vim.keymap.set('n', '<C-[>', vim.diagnostic.goto_prev, bufopts)
@@ -38,8 +28,8 @@ return {
vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
vim.keymap.set('n', 'gs', vim.lsp.buf.signature_help, bufopts)
vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', '<leader><leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, bufopts)
end,