diff --git a/neovim/init.lua b/neovim/init.lua index cbbb815..7ead41e 100644 --- a/neovim/init.lua +++ b/neovim/init.lua @@ -1,6 +1,6 @@ HOME = os.getenv("HOME") --- Configure the clipboard to access the \"+ and \"* registers +-- Configure the clipboard to access the "+ and "* registers -- (not sure why I need this now and didn't before) vim.opt.clipboard = "unnamedplus,unnamed" @@ -116,10 +116,10 @@ require('lualine').setup { } local builtin = require('telescope.builtin') -vim.keymap.set('n', 'ff', builtin.find_files, {}) -vim.keymap.set('n', 'fg', builtin.live_grep, {}) -vim.keymap.set('n', 'fb', builtin.buffers, {}) -vim.keymap.set('n', 'fh', builtin.help_tags, {}) +vim.keymap.set('n', 'ff', builtin.find_files, { desc = 'Telescope: find files' }) +vim.keymap.set('n', 'fg', builtin.live_grep, { desc = 'Telescope: live grep' }) +vim.keymap.set('n', 'fb', builtin.buffers, { desc = 'Telescope: buffers' }) +vim.keymap.set('n', 'fh', builtin.help_tags, { desc = 'Telescope: help tags' }) -------------------- -- nvim-lspconfig -- @@ -167,10 +167,10 @@ lspconfig.rust_analyzer.setup { -- Global mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions -vim.keymap.set('n', 'e', vim.diagnostic.open_float) -vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) -vim.keymap.set('n', ']d', vim.diagnostic.goto_next) -vim.keymap.set('n', 'q', vim.diagnostic.setloclist) +vim.keymap.set('n', 'e', vim.diagnostic.open_float, { desc = 'Diagnostic: open float' }) +vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Diagnostic: go to previous' }) +vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Diagnostic: go to next' }) +vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Diagnostic: set loclist' }) -- Use LspAttach autocommand to only map the following keys -- after the language server attaches to the current buffer @@ -182,27 +182,29 @@ vim.api.nvim_create_autocmd('LspAttach', { -- Buffer local mappings. -- See `:help vim.lsp.*` for documentation on any of the below functions - local opts = { buffer = ev.buf } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) + local opts = function(desc) + return { buffer = ev.buf, desc = desc } + end + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts('LSP: go to declaration')) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts('LSP: go to definition')) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts('LSP: hover')) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts('LSP: go to implementation')) -- This setting steps on my split navigation setting, so I changed it -- to the probably harmless F9. - -- vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, opts) + -- vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts('')) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts('LSP: signature help')) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts('LSP: add workspace folder')) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, opts('LSP: remove workspace folder')) vim.keymap.set('n', 'wl', function() print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, opts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) - vim.keymap.set({ 'n', 'v' }, 'ca', vim.lsp.buf.code_action, opts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) + end, opts('LSP: list workspace folder')) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts('LSP: go to type definition')) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts('LSP: rename token')) + vim.keymap.set({ 'n', 'v' }, 'ca', vim.lsp.buf.code_action, opts('LSP: code action')) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts('LSP: go to references')) vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } - end, opts) + end, opts('LSP: format')) end, }) @@ -331,19 +333,19 @@ require('gitsigns').setup({ end, {expr=true}) -- Actions - map('n', 'hs', gs.stage_hunk) - map('n', 'hr', gs.reset_hunk) - map('v', 'hs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end) - map('v', 'hr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end) - map('n', 'hS', gs.stage_buffer) - map('n', 'hu', gs.undo_stage_hunk) - map('n', 'hR', gs.reset_buffer) - map('n', 'hp', gs.preview_hunk) - map('n', 'hb', function() gs.blame_line{full=true} end) - map('n', 'tb', gs.toggle_current_line_blame) - map('n', 'hd', gs.diffthis) - map('n', 'hD', function() gs.diffthis('~') end) - map('n', 'td', gs.toggle_deleted) + map('n', 'hs', gs.stage_hunk, { desc = 'GitSigns: stage hunk' }) + map('n', 'hr', gs.reset_hunk, { desc = 'GitSigns: reset hunk' }) + map('v', 'hs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end, { desc = 'GitSigns: stage hunk' }) + map('v', 'hr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end, { desc = 'GitSigns: reset hunk' }) + map('n', 'hS', gs.stage_buffer, { desc = 'GitSigns: stage buffer' }) + map('n', 'hu', gs.undo_stage_hunk, { desc = 'GitSigns: undo stage hunk' }) + map('n', 'hR', gs.reset_buffer, { desc = 'GitSigns: reset_buffer' }) + map('n', 'hp', gs.preview_hunk, { desc = 'GitSigns: preview hunk' }) + map('n', 'hb', function() gs.blame_line{full=true} end, { desc = 'GitSigns: blame line' }) + map('n', 'tb', gs.toggle_current_line_blame, { desc = 'GitSigns: toggle current line blame' }) + map('n', 'hd', gs.diffthis, { desc = 'GitSigns: diff this' }) + map('n', 'hD', function() gs.diffthis('~') end, { desc = 'GitSigns: diff this' }) + map('n', 'td', gs.toggle_deleted, { desc = 'GitSigns: toggle deleted' }) end }) diff --git a/newsboat/.newsboat/history.search b/newsboat/.newsboat/history.search index 3c46a88..e08066c 100644 --- a/newsboat/.newsboat/history.search +++ b/newsboat/.newsboat/history.search @@ -9,3 +9,4 @@ Ukraine leak leak wolff +baffler