Revert "update lockfile"

This reverts commit 45cd242bf9.

home/cli/git.nix

@@ -7,13 +7,9 @@
     git-credential-oauth
   ];
 
-  programs.delta = {
-    enable = true;
-    enableGitIntegration = true;
-  };
-
   programs.git = {
     enable = true;
+    delta.enable = true;
     lfs.enable = true;
 
     ignores = ["*~" ".direnv"];
@@ -23,15 +19,14 @@
       signByDefault = true;
     };
 
-    settings = {
+    extraConfig = {
       gpg.format = "ssh";
       push.autoSetupRemote = true;
       pull.rebase = true;
       rebase.autostash = true;
-      user = {
-        name = "xunuwu";
-        email = "xunuwu@gmail.com";
-      };
     };
+
+    userEmail = "xunuwu@gmail.com";
+    userName = "xunuwu";
   };
 }

home/cli/jujutsu.nix

@@ -3,8 +3,8 @@
     enable = true;
     settings = {
       user = {
-        email = config.programs.git.settings.user.email;
-        name = config.programs.git.settings.user.name;
+        email = config.programs.git.userEmail;
+        name = config.programs.git.userName;
       };
       signing = {
         behavior = "own";