diff options
| author | David Luevano Alvarado <david@luevano.xyz> | 2025-11-03 05:46:59 -0600 |
|---|---|---|
| committer | David Luevano Alvarado <david@luevano.xyz> | 2025-11-03 05:46:59 -0600 |
| commit | 6c72d83ada8124072ef79c5774a5eac439ca2ec0 (patch) | |
| tree | 38958ffe95a8f5b02854253e974e5bf6e88cd3c1 | |
| parent | d2afccfda51f0a13cce8e659032fd5c177b721f0 (diff) | |
| -rw-r--r-- | lua/plugins/auto-session.lua | 3 | ||||
| -rw-r--r-- | lua/plugins/context.lua | 3 | ||||
| -rw-r--r-- | lua/plugins/leap.lua | 3 | ||||
| -rw-r--r-- | lua/plugins/lspconfig.lua | 8 |
4 files changed, 8 insertions, 9 deletions
diff --git a/lua/plugins/auto-session.lua b/lua/plugins/auto-session.lua index 974d32d..d10604d 100644 --- a/lua/plugins/auto-session.lua +++ b/lua/plugins/auto-session.lua @@ -39,11 +39,10 @@ return { config = function(_, opts) local ass = require('auto-session') ass.setup(opts) - local sl = require('auto-session.session-lens') vim.keymap.set('n', '<leader>asr', ass.RestoreSession, { desc = '[a]uto [s]ession: [r]estore' }) vim.keymap.set('n', '<leader>ass', ass.SaveSession, { desc = '[a]uto [s]ession: [s]ave' }) vim.keymap.set('n', '<leader>asd', ass.DeleteSession, { desc = '[a]uto [s]ession: [d]elete' }) - vim.keymap.set('n', '<leader>asl', sl.search_session, { desc = '[a]uto [s]ession: [l]list' }) + vim.keymap.set('n', '<leader>asl', '<CMD>Telescope session-lens<CR>', { desc = '[a]uto [s]ession: [l]list' }) end } diff --git a/lua/plugins/context.lua b/lua/plugins/context.lua index b968f5a..dd64e16 100644 --- a/lua/plugins/context.lua +++ b/lua/plugins/context.lua @@ -20,7 +20,6 @@ return { config = function(_, opts) require('treesitter-context').setup(opts) - -- TODO: change keybind? - vim.keymap.set('n', '<leader>cx', '<CMD>TSContextToggle<CR>', { desc = '[C]onte[x]t Toggle' }) + vim.keymap.set('n', '<leader>cx', '<CMD>TSContext toggle<CR>', { desc = '[C]onte[x]t Toggle' }) end, } diff --git a/lua/plugins/leap.lua b/lua/plugins/leap.lua index b1ef5e6..a03d524 100644 --- a/lua/plugins/leap.lua +++ b/lua/plugins/leap.lua @@ -1,6 +1,7 @@ return { 'ggandor/leap.nvim', config = function() - require('leap').create_default_mappings() + vim.keymap.set({ 'n', 'x', 'o' }, 's', '<Plug>(leap)') + vim.keymap.set('n', 'S', '<Plug>(leap-from-window)') end, } diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 5192a36..23ab2b2 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -112,7 +112,7 @@ return { { 'folke/neodev.nvim', opts = {} }, }, config = function() - local lspconfig = require('lspconfig') + local lspconfig = vim.lsp.config -- nvim-cmp supports additional completion capabilities, so broadcast that to servers local capabilities = vim.lsp.protocol.make_client_capabilities() @@ -178,7 +178,7 @@ return { -- generic server setup local function setup_server(server_name) - lspconfig[server_name].setup({ + lspconfig(server_name, { capabilities = capabilities, on_attach = on_attach, settings = servers[server_name], @@ -186,7 +186,7 @@ return { end -- setup_server('clangd') - lspconfig['clangd'].setup({ + lspconfig('clangd', { capabilities = capabilities, on_attach = function(client, bufnr) -- Really only required if NvChad is used: @@ -213,7 +213,7 @@ return { setup_server('bashls') -- assumes localhost is mirrored (networkingMode=mirrored in .wslconfig) -- setup_server('gdscript') - lspconfig['gdscript'].setup({ + lspconfig('gdscript', { capabilities = capabilities, on_attach = on_attach, settings = servers['gdscript'], |