test gitsigns ...

lua/keymappings.lua

@@ -8,9 +8,8 @@ utils.map("n", "<tab>", "<cmd>bn<cr>")
 utils.map("n", "<S-tab>", "<cmd>bp<cr>")
 
 -- Turn spellchecker on
-utils.map("n", "<leader>s", "<cmd>setlocal spell spelllang=en_us<cr>")
+utils.map("n", "<leader>se", "<cmd>setlocal spell spelllang=en_us<cr>")
 
 -- Toggle line numbers and file tree
 utils.map("n", "<F3>", "<cmd>set nonumber!<CR>")
 utils.map("n", "<leader>fe", "<cmd>Oil<CR>")
-utils.map("n", "<leader>ca", "<cmd>CodeActionMenu<CR>")

lua/plugins/gitsigns.lua

@@ -0,0 +1,42 @@
+require('gitsigns').setup {
+  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})
+
+    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
+}

lua/plugins/init.lua

@@ -28,7 +28,6 @@ require('packer').startup(function()
   }
 
   -- Statusbar, colors and syntax
-  use { 'jacoborus/tender.vim' }
   use { 'nvim-treesitter/nvim-treesitter' }
   use { 'vim-airline/vim-airline' }
   use { 'vim-airline/vim-airline-themes' }
@@ -52,6 +51,7 @@ require('packer').startup(function()
           { "sindrets/diffview.nvim" },
       },
   }
+  use { "lewis6991/gitsigns.nvim" }
 
   -- Filesystem in a nvim buffer
   use { 'stevearc/oil.nvim' }
@@ -63,6 +63,7 @@ require('packer').startup(function()
 end)
 
 require('plugins.cmp')
+require('plugins.gitsigns')
 require('plugins.neogit')
 require('plugins.oil')
 require('plugins.treesitter')