diff --git a/nvim/.config/nvim/lua/modules/gitsigns.lua b/nvim/.config/nvim/lua/modules/gitsigns.lua
index dcacec4..0034e24 100644
--- a/nvim/.config/nvim/lua/modules/gitsigns.lua
+++ b/nvim/.config/nvim/lua/modules/gitsigns.lua
@@ -7,13 +7,18 @@ require('gitsigns').setup {
     changedelete = {hl = 'DiffChange', text = '~'},
   },
   keymaps = {
-    [']c']  = '<cmd>lua require("gitsigns").next_hunk()<CR>',
-    ['[c']  = '<cmd>lua require("gitsigns").prev_hunk()<CR>',
-    ['ghs'] = '<cmd>lua require("gitsigns").stage_hunk()<CR>',
-    ['ghu'] = '<cmd>lua require("gitsigns").undo_stage_hunk()<CR>',
-    ['ghr'] = '<cmd>lua require("gitsigns").reset_hunk()<CR>',
+    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>',
   },
   watch_index = {
     interval = 1000
-  }
+  },
+  sign_priority = 6,
 }