summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkshay <[email protected]>2022-08-21 03:26:32 +0100
committerAkshay <[email protected]>2022-08-21 03:26:32 +0100
commit1ad5e8a2de3080a8d737b65953538e5bf46875f5 (patch)
tree9fe68fea3f76ccc043061482803f9269fefa6329
parent47bb74f7ada1ac338c1509994cd7e837a59f1456 (diff)
new bind: <leader>e
l---------init.vim2
-rw-r--r--lua/lsp.lua10
-rw-r--r--plugin/maps.vim1
3 files changed, 7 insertions, 6 deletions
diff --git a/init.vim b/init.vim
index 697d6b2..bc11895 120000
--- a/init.vim
+++ b/init.vim
@@ -1 +1 @@
/nix/store/fc1p35ipvnxslsrj09rzs51zlbc431ad-home-manager-files/.config/nvim/init.vim \ No newline at end of file /nix/store/2c32chzx6k2w0n18ijnsdlkklj58dx2h-home-manager-files/.config/nvim/init.vim \ No newline at end of file
diff --git a/lua/lsp.lua b/lua/lsp.lua
index 62c49d2..7509593 100644
--- a/lua/lsp.lua
+++ b/lua/lsp.lua
@@ -16,14 +16,14 @@ local on_attach = function(client, bufnr)
16 buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) 16 buf_set_keymap('n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
17 buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts) 17 buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
18 buf_set_keymap('n', '<leader>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts) 18 buf_set_keymap('n', '<leader>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts)
19 buf_set_keymap('n', '[g', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts) 19 buf_set_keymap('n', '[g', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
20 buf_set_keymap('n', ']g', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) 20 buf_set_keymap('n', ']g', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
21 buf_set_keymap('n', '<leader>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts) 21 buf_set_keymap('n', '<leader>q', '<cmd>lua vim.diagnostic.set_qflist()<CR>', opts)
22 22
23 -- Set some keybinds conditional on server capabilities 23 -- Set some keybinds conditional on server capabilities
24 if client.resolved_capabilities.document_formatting then 24 if client.server_capabilities.document_formatting then
25 buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts) 25 buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
26 elseif client.resolved_capabilities.document_range_formatting then 26 elseif client.server_capabilities.document_range_formatting then
27 buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts) 27 buf_set_keymap("n", "<leader>f", "<cmd>lua vim.lsp.buf.range_formatting()<CR>", opts)
28 end 28 end
29end 29end
diff --git a/plugin/maps.vim b/plugin/maps.vim
index d252948..b3e12da 100644
--- a/plugin/maps.vim
+++ b/plugin/maps.vim
@@ -12,6 +12,7 @@ nnoremap <Leader>n : bnext<cr>
12nnoremap <Leader>p : bprev<cr> 12nnoremap <Leader>p : bprev<cr>
13nnoremap <Leader>z : FZF<cr> 13nnoremap <Leader>z : FZF<cr>
14nnoremap <Leader>l : Lines<cr> 14nnoremap <Leader>l : Lines<cr>
15nnoremap <Leader>e : Explore<cr>
15nnoremap <Leader>t : call GetTabber()<cr> 16nnoremap <Leader>t : call GetTabber()<cr>
16nnoremap <Leader><ESC> : nohlsearch<cr> 17nnoremap <Leader><ESC> : nohlsearch<cr>
17nnoremap <C-l> :nohlsearch<cr>:diffupdate<cr>:syntax sync fromstart<cr><c-l> 18nnoremap <C-l> :nohlsearch<cr>:diffupdate<cr>:syntax sync fromstart<cr><c-l>