Things

nix/user/git.nix

@@ -3,23 +3,20 @@
 {
   programs.git = {
     enable = true;
+    settings = {
+      alias = {
+        st = "status";
+        ci = "commit";
+        co = "checkout";
+        br = "branch";
+        pl = "pull";
+        ps = "push";
+        sw = "switch";
+        mno =" merge --no-ff";
+        lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit";
+        cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D";
+      };
 
-    aliases = {
-      st = "status";
-      ci = "commit";
-      co = "checkout";
-      br = "branch";
-      pl = "pull";
-      ps = "push";
-      sw = "switch";
-      mno =" merge --no-ff";
-      lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit";
-      cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D";
-    };
-
-    difftastic.enable = true;
-
-    extraConfig = {
       column.ui = "auto";
       branch.sort = "-committerdate";
       tag.sort = "version:refname";
@@ -62,6 +59,11 @@
     ];
   };
 
+  programs.difftastic = {
+    enable = true;
+    git.enable = true;
+  };
+
   programs.lazygit = {
     enable = true;
     settings = {