neovim

commit 1add28b659a2460c8534720541d9dd62787711e8
parent 55441f730cfe8fd6ce5b8bded27b4675dc8e0642
Author: Tomas Nemec <owl@gtms.dev>
Date:   Tue, 26 Nov 2024 08:55:24 +0100

update

Diffstat:
M
after/plugin/cmp.lua
 | 
2
+-
M
after/plugin/leap.lua
 | 
8
+++++---
M
after/plugin/lsp.lua
 | 
10
+++++++---
M
after/plugin/mini-operators.lua
 | 
3
+++
M
after/plugin/neocodeium.lua
 | 
7
++++---
M
after/plugin/treesitter.lua
 | 
4
++--

6 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/after/plugin/cmp.lua b/after/plugin/cmp.lua
@@ -84,7 +84,7 @@ cmp.setup({
   },
   mapping = {
     ['<c-e>'] = cmp.mapping({ i = close(), c = cmp.mapping.abort() }),
-    ['<c-y>'] = cmp.mapping.confirm({ select = false }),
+    ['<c-y>'] = cmp.mapping.confirm({ select = true }),
     ['<c-u>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
     ['<c-d>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
     ['<c-n>'] = cmp.mapping({ i = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }) }),
diff --git a/after/plugin/leap.lua b/after/plugin/leap.lua
@@ -2,9 +2,11 @@ if not pcall(require, 'leap') then
   return
 end
 
-vim.keymap.set('n', 's', '<Plug>(leap)')
-vim.keymap.set('n', 'S', '<Plug>(leap-from-window)')
-vim.keymap.set({ 'x', 'o' }, 's', '<Plug>(leap)')
+local leap = require 'leap'
+
+vim.keymap.set('n', 'S', function()
+  leap.leap { target_windows = vim.api.nvim_tabpage_list_wins(0) }
+end)
 
 if pcall(require, 'tms.p.leap.line') then
   -- For maximum comfort, force linewise selection in the mappings:
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
@@ -13,6 +13,10 @@ local function keymap(client, buf)
 
   local prefix = 'gl'
 
+  if client.supports_method('textDocument/hover') then
+    vim.keymap.set('n', 'K', function() vim.lsp.buf.hover { border = 'single' } end, opts 'LSP Hover')
+  end
+
   if client.supports_method('textDocument/definition') then
     vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts 'LSP Definition')
     vim.keymap.set('n', prefix .. 'd', vim.lsp.buf.definition, opts 'LSP Definition')
@@ -39,7 +43,9 @@ local function keymap(client, buf)
   end
 
   if client.supports_method('textDocument/signatureHelp') then
-    vim.keymap.set({ 'n', 'i' }, '<c-s>', vim.lsp.buf.signature_help, opts 'LSP Signature Help')
+    vim.keymap.set({ 'n', 'i' }, '<c-s>', function()
+      vim.lsp.buf.signature_help { border = 'single' }
+    end, opts 'LSP Signature Help')
   end
 
   if client.supports_method('textDocument/references') then
@@ -139,8 +145,6 @@ handlers['callHierarchy/outgoingCalls'] =
       vim.cmd('botright copen')
     end
 
-handlers['textDocument/hover'] = vim.lsp.with(handlers.hover, { border = 'single' })
-handlers['textDocument/signatureHelp'] = vim.lsp.with(handlers.signature_help, { border = 'single' })
 local crc = handlers['client/registerCapability']
 handlers['client/registerCapability'] = function(_, result, ctx)
   local r = crc(_, result, ctx)
diff --git a/after/plugin/mini-operators.lua b/after/plugin/mini-operators.lua
@@ -1,3 +1,6 @@
 if not pcall(require, 'mini.operators') then return end
 
 require 'mini.operators'.setup()
+
+vim.keymap.set("n", ">p", "<cmd>normal gxiagxina<cr>", { desc = "Mova Parameter Right" })
+vim.keymap.set("n", "<p", "<cmd>normal gxiagxila<cr>", { desc = "Mova Parameter Left" })
diff --git a/after/plugin/neocodeium.lua b/after/plugin/neocodeium.lua
@@ -2,19 +2,20 @@ if not pcall(require, 'neocodeium') then
   return
 end
 
-local codeium = require('neocodeium')
+local codeium = require 'neocodeium'
 codeium.setup {
   show_label = false,
   silent = true,
 }
 
-vim.keymap.set('i', '<c-y>', codeium.accept, { expr = true, desc = 'Codeium Accept' })
+local cmd = require 'neocodeium.commands'
+-- vim.keymap.set('i', '<c-f>', cmd.toggle, { desc = 'Codeium Toggle' })
+vim.keymap.set('i', '<c-y>', codeium.accept, { desc = 'Codeium Accept' })
 -- vim.keymap.set('i', '<c-l>', codeium.accept_line, { expr = true, desc = 'Codeium Accept Line' })
 vim.keymap.set('i', '<c-e>', codeium.clear, { desc = 'Codeium Clear' })
 vim.keymap.set('i', '<c-n>', function() codeium.cycle(1) end, { desc = 'Codeium Next' })
 vim.keymap.set('i', '<c-p>', function() codeium.cycle(-1) end, { desc = 'Codeium Prev' })
 
-
 -- local cmp = require("cmp")
 -- local commands = require("neocodeium.commands")
 
diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua
@@ -54,12 +54,12 @@ require 'nvim-treesitter.configs'.setup {
       enable = false,
       swap_next = {
         --
-        ['>p'] = '@parameter.inner',
+        -- ['>p'] = '@parameter.inner',
         ['>m'] = '@function.outer',
       },
       swap_previous = {
         --
-        ['<p'] = '@parameter.inner',
+        -- ['<p'] = '@parameter.inner',
         ['<m'] = '@function.outer',
       },
     },