X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/ce3499096aaf5e54830b99f64ecf159e9809c644..15bcd8e464dc4c94c774e3786246bdeb1a9f4d2c:/config/nvim/init.lua?ds=sidebyside

diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 02f5bd5..7601d68 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -26,7 +26,6 @@ vim.opt.smartcase = true                    -- Unless we use both cases in searc
 
 -- Autocomplete Behavior
 vim.opt.wildmode = 'list:longest,list:full' -- Autocomplete common matching string
-                                            -- first, and then the full match.
 
 -- Folding Behavior
 vim.opt.foldmethod = 'syntax'               -- Use syntax highlight to define folds
@@ -108,20 +107,34 @@ vim.g.limelight_conceal_guifg = 'DarkGray'
 
 vim.api.nvim_create_autocmd({'User'}, {
   pattern = 'GoyoEnter',
-  callback = 'Limelight'
+  command = 'Limelight'
 })
 vim.api.nvim_create_autocmd({'User'}, {
   pattern = 'GoyoLeave',
-  callback = 'Limelight!'
+  command = 'Limelight!'
 })
---[[
-nnoremap <leader>i :Limelight!!<CR>==
-inoremap <leader>i <Esc>:Limelight!!<CR>==gi
-vnoremap <leader>i :<C-u>Limelight!!<CR>gv=gv
-nnoremap <leader>g :Goyo<CR>==
-inoremap <leader>g <Esc>:Goyo<CR>==gi
-vnoremap <leader>g :<C-u>Goyo<CR>gv=gv
-]]--
+
+vim.keymap.set('n', '<leader>i', ':Limelight!!<CR>==')
+vim.keymap.set('i', '<leader>i', '<Esc>:Limelight!!<CR>==gi')
+vim.keymap.set('v', '<leader>i', ':<C-u>Limelight!!<CR>gv=gv')
+vim.keymap.set('n', '<leader>g', ':Goyo<CR>==')
+vim.keymap.set('i', '<leader>g', '<Esc>:Goyo<CR>==gi')
+vim.keymap.set('v', '<leader>g', ':<C-u>Goyo<CR>gv=gv')
+
+-- CoC
+vim.keymap.set('i', '<TAB>', 'pumvisible() ? "\\<C-n>" : "\\<TAB>"', {expr = true, silent = true})
+vim.keymap.set('i', '<S-TAB>', 'pumvisible() ? "\\<C-p>" : "\\<C-h>"', {expr = true, silent = true})
+vim.keymap.set('i', '<S-TAB>', 'pumvisible() ? "\\<C-p>" : "\\<C-h>"', {expr = true, silent = true})
+vim.keymap.set('i', '<C-Space>', 'coc#refresh()', {expr = true, silent = true})
+vim.keymap.set('n', 'K', ':call CocActionAsync("doHover")<CR>', {silent = true})
+
+vim.keymap.set('n', '[g', '<Plug>(coc-diagnostic-prev)', {silent = true})
+vim.keymap.set('n', ']g', '<Plug>(coc-diagnostic-next)', {silent = true})
+
+vim.keymap.set('n', 'gd', '<Plug>(coc-definition)', {silent = true})
+vim.keymap.set('n', 'gy', '<Plug>(coc-type-definition)', {silent = true})
+vim.keymap.set('n', 'gi', '<Plug>(coc-implementation)', {silent = true})
+vim.keymap.set('n', 'gr', '<Plug>(coc-references)', {silent = true})
 
 -- Plugins
 require('plugins')