diff --git a/cli/pkgs.nix b/cli/pkgs.nix
index 1301cd0..7c3a73c 100644
--- a/cli/pkgs.nix
+++ b/cli/pkgs.nix
@@ -17,7 +17,6 @@ with pkgs;
   wget
   rsync
   yq
-  delta
 
   # Rust utils
   bat
@@ -30,6 +29,7 @@ with pkgs;
   dust
   yazi
   starship
+  difftastic
 
   # Dev
   lazydocker
diff --git a/common/home.nix b/common/home.nix
index b494fef..3958e3d 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -22,7 +22,6 @@
     wget
     rsync
     yq
-    delta
     kubectl
     croc
     asciinema_3
@@ -41,6 +40,7 @@
     yazi
     starship
     ouch
+    difftastic
 
     # TUI
     lazydocker
diff --git a/files/git/gitconfig b/files/git/gitconfig
index 2303249..ed9c1a4 100644
--- a/files/git/gitconfig
+++ b/files/git/gitconfig
@@ -4,12 +4,9 @@
 	process = git-lfs filter-process
 	required = true
 [core]
-    pager = delta
 	excludesfile = ~/.gitignore_global
 	autocrlf = input
 	ignorecase=false
-[interactive]
-    diffFilter = delta --color-only
 
 [pull]
 	rebase = false
@@ -31,5 +28,5 @@
 [include]
     path = ~/.gitconfig.local
 
-[delta]
-    navigate = true
+[diff]
+    external = difft
diff --git a/files/lazygit/config.yaml b/files/lazygit/config.yaml
new file mode 100644
index 0000000..20b329a
--- /dev/null
+++ b/files/lazygit/config.yaml
@@ -0,0 +1,5 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/jesseduffield/lazygit/master/schema/config.json
+
+git:
+  pagers:
+    - externalDiffCommand: difft --color=always
diff --git a/home/home.nix b/home/home.nix
index 09fcd04..c3c8bc2 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -33,8 +33,8 @@ let
         ".gitconfig".source = ../files/git/gitconfig;
         ".gitignore_global".source = ../files/git/gitignore_global;
         ".gitconfig.local".source = ../secrets/git/config.${host.hostName};
-        ".config/nvim".source = ../files/nvim;
-        "Library/Application Support/lazydocker/config.yml".source = ../files/lazydocker/config.yml;
+        ".config/lazygit/config.yml".source = ../files/lazygit/config.yaml;
+        ".config/lazydocker/config.yml".source = ../files/lazydocker/config.yml;
 
         # Secrets
         ".ssh/config".text = builtins.replaceStrings [ "@SSH_KEY@" ] [ host.sshKey ] (
@@ -51,6 +51,10 @@ let
         vai = "sudo darwin-rebuild switch --flake ~/.config/dotfiles#${host.hostName}";
         clean = "nix-collect-garbage -d";
       };
+
+      sessionVariables = {
+        XDG_CONFIG_HOME = "$HOME/.config";
+      };
     };
   };
 
diff --git a/secrets/zed/settings.json b/secrets/zed/settings.json
index aac08da..a1d2300 100644
Binary files a/secrets/zed/settings.json and b/secrets/zed/settings.json differ