diff --git a/modules/tui/neovim.nix b/modules/tui/neovim.nix
index 35cdc645..376d42a2 100644
--- a/modules/tui/neovim.nix
+++ b/modules/tui/neovim.nix
@@ -112,6 +112,50 @@ in {
                         numhl = true;
                         signcolumn = true;
                         wordDiff = true;
+                        onAttach = {
+                            function = ''
+                                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})
+
+                                    map('n', '[c', function()
+                                      if vim.wo.diff then return '[c' end
+                                      vim.schedule(function() gs.prev_hunk() end)
+                                      return '<Ignore>'
+                                    end, {expr=true})
+
+                                    -- Actions
+                                    map('n', '<leader>hs', gs.stage_hunk)
+                                    map('n', '<leader>hr', gs.reset_hunk)
+                                    map('v', '<leader>hs', function() gs.stage_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+                                    map('v', '<leader>hr', function() gs.reset_hunk {vim.fn.line('.'), vim.fn.line('v')} end)
+                                    map('n', '<leader>hS', gs.stage_buffer)
+                                    map('n', '<leader>hu', gs.undo_stage_hunk)
+                                    map('n', '<leader>hR', gs.reset_buffer)
+                                    map('n', '<leader>hp', gs.preview_hunk)
+                                    map('n', '<leader>hb', function() gs.blame_line{full=true} end)
+                                    map('n', '<leader>tb', gs.toggle_current_line_blame)
+                                    map('n', '<leader>hd', gs.diffthis)
+                                    map('n', '<leader>hD', function() gs.diffthis('~') end)
+                                    map('n', '<leader>td', gs.toggle_deleted)
+
+                                    -- Text object
+                                    map({'o', 'x'}, 'ih', ':<C-U>Gitsigns select_hunk<CR>')
+                                  end
+                            '';
+                        };
                     };
                     lsp = {
                         enable = true;