diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua
new file mode 100644
index 00000000..533bbf20
--- /dev/null
+++ b/after/plugin/gitsigns.lua
@@ -0,0 +1,71 @@
+require('gitsigns').setup {
+      signs = {
+        add = { text = '+' },
+        change = { text = '~' },
+        delete = { text = '_' },
+        topdelete = { text = '‾' },
+        changedelete = { text = '~' },
+      },
+    on_attach = function(bufnr)
+        local gs = package.loaded.gitsigns
+
+        local function map(mode, l, r, opts)
+            opts = opts or {}
+            opts.buffer = bufnr
+            vim.keymap.set(mode, l, r, opts)
+        end
+
+        -- Navigation
+        map('n', ']c', function()
+            if vim.wo.diff then return ']c' end
+            vim.schedule(function() gs.next_hunk() end)
+            return '<Ignore>'
+        end, { expr = true, desc = "gitsigns: next hunk" })
+
+        map('n', '[c', function()
+            if vim.wo.diff then return '[c' end
+            vim.schedule(function() gs.prev_hunk() end)
+            return '<Ignore>'
+        end, { expr = true, desc = "gitsigns: prev hunk" })
+
+        -- Actions
+        map('n', '<leader>hs', gs.stage_hunk,
+            { desc = "gitsigns: stage hunk" })
+        map('n', '<leader>hr', gs.reset_hunk,
+            { desc = "gitsigns: reset hunk" })
+        map('v', '<leader>hs', function()
+                gs.stage_hunk { vim.fn.line("."), vim.fn.line("v") }
+            end,
+            { desc = "gitsigns: stage hunk (selection)" })
+        map('v', '<leader>hr', function()
+                gs.reset_hunk { vim.fn.line("."), vim.fn.line("v") }
+            end,
+            { desc = "gitsigns: reset hunk (selection)" })
+        map('n', '<leader>hS', gs.stage_buffer,
+            { desc = "gitsigns: stage buffer" })
+        map('n', '<leader>hu', gs.undo_stage_hunk,
+            { desc = "gitsigns: undo stage hunk" })
+        map('n', '<leader>hR', gs.reset_buffer,
+            { desc = "gitsigns: reset buffer" })
+        map('n', '<leader>hp', gs.preview_hunk,
+            { desc = "gitsigns: preview hunk" })
+        map('n', '<leader>hb', function()
+                gs.blame_line { full = true }
+            end,
+            { desc = "gitsigns: blame line" })
+        map('n', '<leader>tb', gs.toggle_current_line_blame,
+            { desc = "gitsigns: toggle current line blame" })
+        map('n', '<leader>hd', gs.diffthis,
+            { desc = "gitsigns: diff" })
+        map('n', '<leader>hD', function()
+                gs.diffthis('~')
+            end,
+            { desc = "gitsigns: diff (parent)" })
+        map('n', '<leader>td', gs.toggle_deleted,
+            { desc = "gitsigns: toggle deleted" })
+
+        -- Text object
+        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+    end,
+}
+
diff --git a/after/plugin/toggleterm.lua b/after/plugin/toggleterm.lua
index b8b1226a..49417897 100644
--- a/after/plugin/toggleterm.lua
+++ b/after/plugin/toggleterm.lua
@@ -1,6 +1,6 @@
 local Terminal = require('toggleterm.terminal').Terminal
 local lazygit  = Terminal:new({ cmd = 'lazygit', hidden = true })
 
-vim.keymap.set('n', '<leader>g', function()
+vim.keymap.set('n', '<leader>gg', function()
     lazygit:toggle()
 end, { noremap = true, silent = true, desc = 'Toggle lazygit' })
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index 049f97d7..f4cf8471 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -12,6 +12,8 @@ return {
   "famiu/bufdelete.nvim",
   "tpope/vim-repeat",
   "JoosepAlviste/nvim-ts-context-commentstring",
+  "sindrets/diffview.nvim",
+  "rhysd/git-messenger.vim",
   {
     "windwp/nvim-ts-autotag",
     dependencies = {