diff --git a/nvimrc b/nvimrc
index 2201011..ccdde5e 100644
--- a/nvimrc
+++ b/nvimrc
@@ -182,7 +182,6 @@ endfunction
 nnoremap <leader>as :Git<cr>
 nnoremap <leader>ab :Git blame<cr>
 nnoremap <leader>ac :Commits<cr>
-nnoremap <leader>ah :GitGutterLineHighlightsToggle<cr>
 nnoremap <leader>aY :call CopyGitURLToLineOrRange()<cr>
 vnoremap <leader>aY :call CopyGitURLToLineOrRange()<cr>
 nnoremap <leader>ao :call OpenGitURLToLineOrRange()<cr>
@@ -242,15 +241,10 @@ packadd! nvim-web-devicons " https://github.com/nvim-tree/nvim-web-devicons.git
 
 lua require "lightline_config"
 
-" vim-gitgutter configuration
-packadd! vim-gitgutter " https://github.com/airblade/vim-gitgutter.git
-set signcolumn=yes
-nmap ]h <Plug>(GitGutterNextHunk)
-nmap [h <Plug>(GitGutterPrevHunk)
-omap ih <Plug>(GitGutterTextObjectInnerPending)
-omap ah <Plug>(GitGutterTextObjectOuterPending)
-xmap ih <Plug>(GitGutterTextObjectInnerVisual)
-xmap ah <Plug>(GitGutterTextObjectOuterVisual)
+" gitsigns.nvim
+packadd! gitsigns.nvim " https://github.com/lewis6991/gitsigns.nvim.git
+
+lua require "gitsigns_config"
 
 " enable inline vim highlighting:
 let g:vimsyn_embed= 'lPr'
diff --git a/vim/lua/gitsigns_config.lua b/vim/lua/gitsigns_config.lua
new file mode 100644
index 0000000..f591080
--- /dev/null
+++ b/vim/lua/gitsigns_config.lua
@@ -0,0 +1,93 @@
+require("gitsigns").setup({
+	signs = {
+		add = { text = "│" },
+		change = { text = "~" },
+		delete = { text = "_" },
+		topdelete = { text = "‾" },
+		changedelete = { text = "%" },
+		untracked = { text = "┆" },
+	},
+	signcolumn = true,
+	numhl = false,
+	linehl = false,
+	word_diff = false,
+	watch_gitdir = {
+		follow_files = true,
+	},
+	attach_to_untracked = true,
+	current_line_blame = true,
+	current_line_blame_opts = {
+		virt_text = true,
+		virt_text_pos = "eol",
+		delay = 1000,
+		ignore_whitespace = false,
+	},
+	current_line_blame_formatter = "<author>, <author_time:%Y-%m-%d> - <summary>",
+	sign_priority = 6,
+	update_debounce = 100,
+	status_formatter = nil,
+	max_file_length = 40000,
+	preview_config = {
+		border = "single",
+		style = "minimal",
+		relative = "cursor",
+		row = 0,
+		col = 1,
+	},
+	yadm = {
+		enable = false,
+	},
+	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
+
+		map("n", "]h", function()
+			if vim.wo.diff then
+				return "]h"
+			end
+			vim.schedule(function()
+				gs.next_hunk()
+			end)
+			return "<Ignore>"
+		end, { expr = true })
+
+		map("n", "[h", function()
+			if vim.wo.diff then
+				return "[h"
+			end
+			vim.schedule(function()
+				gs.prev_hunk()
+			end)
+			return "<Ignore>"
+		end, { expr = true })
+
+		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)
+
+		map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>")
+	end,
+})