diff --git a/hm/git.nix b/hm/git.nix
index 278e653..4b86e9b 100644
--- a/hm/git.nix
+++ b/hm/git.nix
@@ -92,28 +92,18 @@ in
     git = {
       enable = true;
       package = pkgs.gitFull;
-      userName = "Filippo Berto";
-      userEmail = "berto.f@protonmail.com";
       # signing = {
       #   key = "berto.f@protonmail.com";
       #   signByDefault = true;
       # };
-      extraConfig = {
+      settings = {
+        user = { name = "Filippo Berto"; email = "berto.f@protonmail.com"; };
         "add.interactive".useBuiltin = false;
         branch.sort = "-committerdate";
         column.ui = "auto";
         commit.gpgSign = true;
-        core = {
-          editor = "hx";
-          fsmonitor = true;
-        };
+        core = { editor = "hx"; fsmonitor = true; };
         credential.helper = "libsecret";
-        delta = {
-          line-numbers = true;
-          navigate = true;
-          side-by-side = true;
-          wrap-max-lines = "unlimited";
-        };
         diff = {
           algorithm = "histogram";
           colorMoved = "default";
@@ -127,26 +117,31 @@ in
           tool = "vimdiff";
         };
         pull.rebase = true;
-        rebase = {
-          autoStash = true;
-          autoSquash = true;
-        };
-        rerere = {
-          enabled = true;
-          autoUpdate = true;
-        };
+        rebase = { autoStash = true; autoSquash = true; };
+        rerere = { enabled = true; autoUpdate = true; };
         tag.sort = "version:refname";
         user.signingKey = "berto.f@protonmail.com";
       };
       lfs.enable = true;
-      delta.enable = true;
     };
 
     git-cliff.enable = true;
 
     bash.shellAliases = shellAliases;
     zsh.shellAliases = shellAliases;
+
+    delta = {
+      enable = true;
+      enableGitIntegration = true;
+      options = {
+        line-numbers = true;
+        navigate = true;
+        side-by-side = true;
+        wrap-max-lines = "unlimited";
+      };
+    };
   };
+
   home.packages = builtins.attrValues {
     inherit (pkgs)
       gh