dotfiles/.gitconfig

@@ -5,22 +5,25 @@
 [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

home.nix

@@ -38,9 +38,6 @@
     github-copilot-cli
     nerd-fonts.iosevka-term
     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
@@ -95,41 +92,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
     '';
-    plugins = [
-      {
-        name = "tide";
-        src = pkgs.fetchFromGitHub {
-          owner = "plttn";
-          repo = "tide";
-          rev = "v7";
-          hash = "sha256-R2oIGbDPF81NurJ5R2Jos6P5mxYTyb1n1cpI1AZ35H4=";
-        };
-      }
-      {
-        name = "fish-git-abbr";
-        src = pkgs.fetchFromGitHub {
-          owner = "lewisacidic";
-          repo = "fish-git-abbr";
-          rev = "dc590a5b9d9d2095f95f7d90608b48e55bea0b0e";
-          hash = "sha256-6z3Wr2t8CP85xVEp6UCYaM2KC9PX4MDyx19f/wjHkb0=";
-        };
-      }
-      {
-        name = "fzf-fish";
-        src = pkgs.fetchFromGitHub {
-          owner = "PatrickF1";
-          repo = "fzf.fish";
-          rev = "v11.0";
-          hash = "sha256-H7HgYT+okuVXo2SinrSs+hxAKCn4Q4su7oMbebKd/7s=";
-        };
-      }
-    ];
   };
 
   fonts.fontconfig.enable = true;