diff --git a/config/nvim/lua/config_plugins/config_gitsigns.lua b/config/nvim/lua/config_plugins/config_gitsigns.lua index 5ea58e9f..f9a85eca 100644 --- a/config/nvim/lua/config_plugins/config_gitsigns.lua +++ b/config/nvim/lua/config_plugins/config_gitsigns.lua @@ -16,7 +16,7 @@ require('gitsigns').setup { vim.api.nvim_buf_set_keymap(bufnr, 'n', 'hr', 'Gitsigns reset_hunk', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'bs', 'Gitsigns stage_buffer', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'br', 'Gitsigns reset_buffer', {}) - vim.api.nvim_buf_set_keymap(bufnr, 'n', 'bl', 'Gitsigns blame_line', {}) + vim.api.nvim_buf_set_keymap(bufnr, 'n', 'lb', 'Gitsigns blame_line', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'btn', 'Gitsigns toggle_numhl', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'btl', 'Gitsigns toggle_linehl', {}) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'btc', 'Gitsigns toggle_current_line_blame', {}) diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua index d09894f6..6084124d 100644 --- a/config/nvim/lua/keymaps.lua +++ b/config/nvim/lua/keymaps.lua @@ -13,13 +13,9 @@ end vim.g.mapleader = ' ' -- Misc imap('jk', '') -nmap('gg', '10TermExec cmd="lazygit; exit" direction="vertical" go_back=0') -nmap('gh', '10TermExec cmd="lazygit; exit" direction="horizontal" go_back=0') -nmap('gf', '10TermExec cmd="lazygit; exit" direction="float" go_back=0') nmap('gp', 'Git pull') -nmap('gP', 'Git push') +nmap('gu', 'Git push') nmap('cc', 'Git commit') -nmap('co', ':Git checkout') -- Telescope nmap(';', 'Telescope builtin') @@ -33,7 +29,10 @@ nmap('fe', 'Telescope diagnostics') nmap('fn', 'Telescope notify') nmap('ft', 'Telescope treesitter') nmap('fz', 'Telescope current_buffer_fuzzy_find') -nmap('fg', 'Telescope git_status') +nmap('gg', 'Telescope git_status') +nmap('gc', 'Telescope git_commits') +nmap('gb', 'Telescope git_bcommits') +nmap('co', 'Telescope git_branches') -- Hop nmap('hl', 'HopLine')