diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..720eb5f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.* diff=delta
+*.yml diff=dyff
+*.yaml diff=dyff
diff --git a/.gitconfig b/.gitconfig
index 8c2636e..37bafd0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,6 +13,7 @@
     template = ~/.gitmessage
 [core]
     autocrlf = input
+    attributesFile = ~/.dotfiles/gitattributes
     pager = delta
 [github]
     user = rad4day
@@ -32,3 +33,7 @@
 	protocol = https
 [credential]
 	helper = store
+[init]
+	defaultBranch = main
+[diff "dyff"]
+	command = "dyff_between() { dyff --color on between --omit-header \"$2\" \"$5\"; }; dyff_between"