home-manager: Update git settings renames

Author: RossSmyth

home-manager/git.nix

@@ -1,15 +1,11 @@
 {
+  programs.difftastic.git.enable = true;
 
   programs.git = {
-    difftastic.enable = true;
     enable = true;
-    userEmail = "[email protected]";
-    userName = "Ross Smyth";
-    aliases = {
-      amend = "commit --amend --no-edit";
-      cm = "commit -m";
-    };
-    extraConfig = {
+
+    settings = {
+      user.name = "Ross Smyth";
       push = {
         default = "current";
         followTags = true;

home-manager/jujutsu.nix

@@ -30,7 +30,7 @@
       };
       diff.tool = "difft";
       merge-tools.difft = {
-        program = lib.getExe config.programs.git.difftastic.package;
+        program = lib.getExe config.programs.difftastic.package;
         diff-args = [
           "--color=always"
           "$left"