diff --git a/home/modules/programs/git.nix b/home/modules/programs/git.nix
index f8a3a1c..d76600c 100644
--- a/home/modules/programs/git.nix
+++ b/home/modules/programs/git.nix
@@ -47,18 +47,19 @@
           };
           git = {
             enable = true;
-            userEmail = cfg.email;
-            userName = cfg.name;
-            delta = {
-              enable = true;
-              options = {
-                line-number = true;
-                hyperlinks = true;
-                side-by-side = true;
-              };
+            settings.user = {
+              inherit (cfg) email name;
             };
             lfs.enable = true;
           };
+          delta = {
+            enable = true;
+            options = {
+              line-number = true;
+              hyperlinks = true;
+              side-by-side = true;
+            };
+          };
         };
       }
       (lib.mkIf (cfg.signKey != null) {
@@ -69,7 +70,7 @@
         };
       })
       (lib.mkIf cfg.encrypt-credential {
-        programs.git.extraConfig = {
+        programs.git.settings = {
           credential = {
             helper = "store --file=${config.sops.secrets."git-credential".path}";
           };
diff --git a/home/modules/programs/jujutsu.nix b/home/modules/programs/jujutsu.nix
index 34fef21..48c8942 100644
--- a/home/modules/programs/jujutsu.nix
+++ b/home/modules/programs/jujutsu.nix
@@ -38,7 +38,6 @@ in
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
       home.packages = with pkgs; [
-        delta
         watchman
       ];
       programs.jujutsu = {