diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua index 2f3d9fd..a46ebbd 100644 --- a/common/.config/nvim/lua/lsp-general.lua +++ b/common/.config/nvim/lua/lsp-general.lua @@ -86,18 +86,18 @@ lsp.set_preferences({ lsp.on_attach(function(_, bufnr) vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') local opts = { noremap = true, silent = true, buffer = bufnr } - vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.definition()', opts) - vim.keymap.set('n', 'gT', 'lua vim.lsp.buf.type_definition()', opts) - vim.keymap.set('n', 'gI', 'lua vim.lsp.buf.implementation()', opts) - vim.keymap.set('n', 'gR', 'lua vim.lsp.buf.references()', opts) + vim.keymap.set('n', 'lD', 'lua vim.lsp.buf.definition()', opts) + vim.keymap.set('n', 'lT', 'lua vim.lsp.buf.type_definition()', opts) + vim.keymap.set('n', 'lI', 'lua vim.lsp.buf.implementation()', opts) + vim.keymap.set('n', 'lR', 'lua vim.lsp.buf.references()', opts) vim.keymap.set('n', '', 'lua vim.lsp.buf.code_action()', opts) -- Glance LSP - vim.keymap.set('n', 'gd', 'Glance definitions', opts) - vim.keymap.set('n', 'gt', 'Glance type_definitions', opts) - vim.keymap.set('n', 'gi', 'Glance implementations', opts) - vim.keymap.set('n', 'gr', 'Glance references', opts) + vim.keymap.set('n', 'ld', 'Glance definitions', opts) + vim.keymap.set('n', 'lt', 'Glance type_definitions', opts) + vim.keymap.set('n', 'li', 'Glance implementations', opts) + vim.keymap.set('n', 'lr', 'Glance references', opts) end) lsp.setup() diff --git a/common/.config/nvim/lua/plugin-config/gitsigns.lua b/common/.config/nvim/lua/plugin-config/gitsigns.lua index a4accd5..d4014b2 100644 --- a/common/.config/nvim/lua/plugin-config/gitsigns.lua +++ b/common/.config/nvim/lua/plugin-config/gitsigns.lua @@ -1,56 +1,48 @@ require('gitsigns').setup { - keymaps = { - -- Default keymap options - noremap = tue, - buffer = true, - - ['n hn'] = { expr = true, "&diff ? 'hn' : 'lua require\"gitsigns\".next_hunk()'"}, - ['n hN'] = { expr = true, "&diff ? 'hN' : 'lua require\"gitsigns\".prev_hunk()'"}, - - ['n hs'] = 'lua require"gitsigns".stage_hunk()', - ['n hu'] = 'lua require"gitsigns".undo_stage_hunk()', - ['n hr'] = 'lua require"gitsigns".reset_hunk()', - ['n hR'] = 'lua require"gitsigns".reset_buffer()', - ['n hp'] = 'lua require"gitsigns".preview_hunk()', - ['n hb'] = 'lua require"gitsigns".blame_line()', - }, - signs = { - add = {hl = 'GitSignsAdd' , text = '│', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'}, - change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, - delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, - topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, - changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, - }, - signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` - numhl = false, -- Toggle with `:Gitsigns toggle_numhl` - linehl = false, -- Toggle with `:Gitsigns toggle_linehl` - word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` - watch_gitdir = { - interval = 1000, - follow_files = true - }, - attach_to_untracked = true, - current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` - current_line_blame_opts = { - virt_text = true, - virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' - delay = 100, - ignore_whitespace = false, - }, - current_line_blame_formatter = ', - ', - sign_priority = 6, - update_debounce = 100, - status_formatter = nil, -- Use default - max_file_length = 40000, - preview_config = { - -- Options passed to nvim_open_win - border = 'single', - style = 'minimal', - relative = 'cursor', - row = 0, - col = 1 - }, - yadm = { - enable = false - }, + keymaps = { + -- Default keymap options + noremap = true, + buffer = true, + ['n gb'] = 'lua require"gitsigns".blame_line()', + }, + signs = { + add = {hl = 'GitSignsAdd' , text = '│', numhl='GitSignsAddNr' , linehl='GitSignsAddLn'}, + change = {hl = 'GitSignsChange', text = '│', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + delete = {hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + topdelete = {hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'}, + changedelete = {hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'}, + }, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + interval = 1000, + follow_files = true + }, + attach_to_untracked = true, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 100, + ignore_whitespace = false, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, + preview_config = { + -- Options passed to nvim_open_win + border = 'single', + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, + yadm = { + enable = false + }, } +