diff --git a/home/.gitconfig b/home/.gitconfig
index 6be5108..423e9f1 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -2,19 +2,24 @@
 	email = marko.korhonen@reekynet.com
 	name = Marko Korhonen
 	signingkey = C514037F1EFF4FA6
+
 [commit]
 	signoff = true
 	gpgsign = true
-[merge]
-  tool = vimdiff
-[mergetool]
-  prompt = true
-[mergetool "vimdiff"]
-  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
-[difftool]
-  prompt = false
-[diff]
-  tool = vimdiff
 [tag]
 	gpgSign = true
 	signoff = true
+[format]
+	signoff = true
+
+[merge]
+	prompt = false
+	tool = nvim-merge
+[mergetool "nvim-merge"]
+	cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+
+[diff]
+	prompt = false
+	tool = nvim-diff
+[difftool "nvim-diff"]
+	cmd = nvim -d -c 'set nomodifiable'