diff --git a/nvim/.config/nvim/lua/modules/gitsigns.lua b/nvim/.config/nvim/lua/modules/gitsigns.lua
deleted file mode 100644
index 7b273c2..0000000
--- a/nvim/.config/nvim/lua/modules/gitsigns.lua
+++ /dev/null
@@ -1,30 +0,0 @@
-require('gitsigns').setup {
-  signs = {
-    add          = {hl = 'DiffAdd'   , text = '+'},
-    change       = {hl = 'DiffChange', text = '!'},
-    delete       = {hl = 'DiffDelete', text = 'x'},
-    topdelete    = {hl = 'DiffDelete', text = '-'},
-    changedelete = {hl = 'DiffChange', text = '~'},
-  },
-  numhl = false,
-  keymaps = {
-    noremap = true,
-    buffer = true,
-
-    ['n ]c'] = { expr = true, "&diff ? ']c' : '<cmd>lua require\"gitsigns\".next_hunk()<CR>'"},
-    ['n [c'] = { expr = true, "&diff ? '[c' : '<cmd>lua require\"gitsigns\".prev_hunk()<CR>'"},
-
-    ['n ghs'] = '<cmd>lua require"gitsigns".stage_hunk()<CR>',
-    ['n ghu'] = '<cmd>lua require"gitsigns".undo_stage_hunk()<CR>',
-    ['n ghr'] = '<cmd>lua require"gitsigns".reset_hunk()<CR>',
-    ['n ghp'] = '<cmd>lua require"gitsigns".preview_hunk()<CR>',
-    ['n ghb'] = '<cmd>lua require"gitsigns".blame_line()<CR>',
-    ['o ih']  = ':<C-U>lua require"gitsigns".text_object()<CR>',
-    ['x ih']  = ':<C-U>lua require"gitsigns".text_object()<CR>'
-  },
-  watch_index = {
-    interval = 1000
-  },
-  sign_priority = 6,
-  status_formatter = nil,
-}
diff --git a/nvim/.config/nvim/lua/modules/signify.lua b/nvim/.config/nvim/lua/modules/signify.lua
new file mode 100644
index 0000000..fdbe302
--- /dev/null
+++ b/nvim/.config/nvim/lua/modules/signify.lua
@@ -0,0 +1,12 @@
+local remap = vim.api.nvim_set_keymap
+
+remap('n', 'ghr', ':SignifyHunkUndo<CR>', { noremap = true })
+remap('n', 'ghp', ':SignifyHunkDiff<CR>', { noremap = true })
+remap('n', ']c',  '<Plug>(signify-next-hunk)', { noremap = false })
+remap('n', '[c',  '<Plug>(signify-prev-hunk)', { noremap = false })
+remap('n', ']C',  '9999]c', { noremap = false })
+remap('n', '[C',  '9999[c', { noremap = false })
+remap('o', 'ih',  '<Plug>(signify-motion-inner-pending)', { noremap = false })
+remap('x', 'ih',  '<Plug>(signify-motion-inner-visual)',  { noremap = false })
+remap('o', 'ah',  '<Plug>(signify-motion-outer-pending)', { noremap = false })
+remap('x', 'ah',  '<Plug>(signify-motion-outer-visual)',  { noremap = false })
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index ac9a3b8..1e12662 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -41,10 +41,9 @@ local init = function ()
   -- For tmux
   use 'tmux-plugins/vim-tmux-focus-events'
   -- Git support
-  use 'nvim-lua/plenary.nvim'
   use {
-    'lewis6991/gitsigns.nvim',
-    config =  "require('modules.gitsigns')"
+    'mhinz/vim-signify',
+    config =  "require('modules.signify')"
   }
   use 'lambdalisue/gina.vim'
   use 'rhysd/git-messenger.vim'