diff options
author | Damjan 9000 <damjan.9000@gmail.com> | 2023-11-07 17:20:40 +0100 |
---|---|---|
committer | Damjan 9000 <damjan.9000@gmail.com> | 2023-11-07 17:20:40 +0100 |
commit | 8801505f962fbc2406d66fc0ea282ba585c3cb66 (patch) | |
tree | adff46ea9c029318c7584fd719b26bc5914feff6 /lua | |
parent | 0d1f2c56395b5614f10fffc065eb05b36dc202c9 (diff) | |
parent | a005f15cec8072c97201f86e15df62c7e4a4490e (diff) |
Merge remote-tracking branch 'upstream/master'
- init.lua: minor edits of section comments for consistency
- init.lua: move diagnostic keymaps together with other keymaps
Diffstat (limited to 'lua')
-rw-r--r-- | lua/keymaps.lua | 12 | ||||
-rw-r--r-- | lua/lazy-bootstrap.lua | 2 | ||||
-rw-r--r-- | lua/lazy-plugins.lua | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 22d7796..f821e65 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -8,6 +8,12 @@ vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true }) vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true }) +-- Diagnostic keymaps +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' }) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' }) +vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' }) +vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' }) + -- [[ Highlight on yank ]] -- See `:help vim.highlight.on_yank()` local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true }) @@ -19,10 +25,4 @@ vim.api.nvim_create_autocmd('TextYankPost', { pattern = '*', }) --- Diagnostic keymaps -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' }) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' }) -vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' }) -vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' }) - -- vim: ts=2 sts=2 sw=2 et diff --git a/lua/lazy-bootstrap.lua b/lua/lazy-bootstrap.lua index 70aebf5..f75c630 100644 --- a/lua/lazy-bootstrap.lua +++ b/lua/lazy-bootstrap.lua @@ -1,4 +1,4 @@ --- [[ Bootstrap lazy plugin manager ]] +-- [[ Install `lazy.nvim` plugin manager ]] -- https://github.com/folke/lazy.nvim -- `:help lazy.nvim.txt` for more info local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index 03418e2..df64d4c 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -1,4 +1,4 @@ --- [[ Setup lazy plugin manager ]] +-- [[ Configure plugins ]] -- NOTE: Here is where you install your plugins. -- You can configure plugins using the `config` key. -- |