From 82b6838dff88c2f7596891b9efb79d4bc9313c80 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 24 Jan 2023 13:57:33 +0000
Subject: [PATCH] Update some git-related keymaps

---
 config/nvim/lua/config_plugins/config_gitsigns.lua |  2 +-
 config/nvim/lua/keymaps.lua                        | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

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', '<leader>hr', '<cmd>Gitsigns reset_hunk<CR>', {})
         vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bs', '<cmd>Gitsigns stage_buffer<CR>', {})
         vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>br', '<cmd>Gitsigns reset_buffer<CR>', {})
-        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>bl', '<cmd>Gitsigns blame_line<CR>', {})
+        vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>lb', '<cmd>Gitsigns blame_line<CR>', {})
         vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>btn', '<cmd>Gitsigns toggle_numhl<CR>', {})
         vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>btl', '<cmd>Gitsigns toggle_linehl<CR>', {})
         vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>btc', '<cmd>Gitsigns toggle_current_line_blame<CR>', {})
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', '<Esc>')
-nmap('<leader>gg', '<cmd>10TermExec cmd="lazygit; exit" direction="vertical" go_back=0<cr>')
-nmap('<leader>gh', '<cmd>10TermExec cmd="lazygit; exit" direction="horizontal" go_back=0<cr>')
-nmap('<leader>gf', '<cmd>10TermExec cmd="lazygit; exit" direction="float" go_back=0<cr>')
 nmap('<leader>gp', '<cmd>Git pull<cr>')
-nmap('<leader>gP', '<cmd>Git push<cr>')
+nmap('<leader>gu', '<cmd>Git push<cr>')
 nmap('<leader>cc', '<cmd>Git commit<cr>')
-nmap('<leader>co', ':Git checkout')
 
 -- Telescope
 nmap('<leader>;', '<cmd>Telescope builtin<cr>')
@@ -33,7 +29,10 @@ nmap('<leader>fe', '<cmd>Telescope diagnostics<cr>')
 nmap('<leader>fn', '<cmd>Telescope notify<cr>')
 nmap('<leader>ft', '<cmd>Telescope treesitter<cr>')
 nmap('<leader>fz', '<cmd>Telescope current_buffer_fuzzy_find<cr>')
-nmap('<leader>fg', '<cmd>Telescope git_status<cr>')
+nmap('<leader>gg', '<cmd>Telescope git_status<cr>')
+nmap('<leader>gc', '<cmd>Telescope git_commits<cr>')
+nmap('<leader>gb', '<cmd>Telescope git_bcommits<cr>')
+nmap('<leader>co', '<cmd>Telescope git_branches<cr>')
 
 -- Hop
 nmap('<leader>hl', '<cmd>HopLine<cr>')