diff --git a/dot_config/git/config b/dot_config/git/config.tmpl
similarity index 65%
rename from dot_config/git/config
rename to dot_config/git/config.tmpl
index 162ff87..dd4f89c 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config.tmpl
@@ -1,6 +1,6 @@
 [user]
     name = Vladimír Dudr
-    email = vladimir@tango-dj.cz
+    email = dudr@metrans.cz
 
 [http "https://gopkg.in"]
     followRedirects = true
@@ -27,9 +27,6 @@
     syntax-theme = gruvbox-dark
     hyperlinks = true
 
-[interactive]
-    diffFilter = delta --color-only
-
 [diff]
 	algorithm = patience
 	external = difft
@@ -42,3 +39,13 @@
 [merge]
     tool = nvimdiff
     conflictstyle = diff3
+[credential]
+	helper = gopass
+[credential "https://gitlab.corp.metrans.cz"]
+	username = dudr
+
+[diff "sops"]
+    textconv = sops --config /dev/null -d
+
+[diff "ansible-vault"]
+    textconv = ansible-vault view --vault-password-file <(gopass show --password metrans/ansible-vault)