diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
index 25d20f1..130fa13 100644
--- a/dotfiles/.gitconfig
+++ b/dotfiles/.gitconfig
@@ -5,25 +5,22 @@
 [push]
 	default = current
 
-[diff]
-  external = difft
-	tool = difftastic
-
-[difftool]
-	prompt = false
-
-[difftool "difftastic"]
-	cmd = difft "$LOCAL" "$REMOTE"
-
-[pager]
-	difftool = true
-
 [credential]
 	helper = cache --timeout=600
 
 [core]
 	editor = nvim
 	autocrlf = input
+  pager = delta
 
 [init]
 	defaultBranch = main
+
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true  # use n and N to move between diff sections
+
+[merge]
+    conflictStyle = zdiff3
diff --git a/home.nix b/home.nix
index 3570179..447e25a 100644
--- a/home.nix
+++ b/home.nix
@@ -40,6 +40,7 @@
     fzf
     fd
     bat
+    delta
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
     # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
@@ -94,6 +95,9 @@
   programs.home-manager.enable = true;
   programs.fish = {
     enable = true;
+    shellInit = ''
+      set fzf_diff_highlighter delta --paging=never --width=20
+    '';
     shellInitLast = ''
       zoxide init fish | source
     '';