1 files changed, 38 insertions, 35 deletions
diff --git a/modules/hm/sils/git.nix b/modules/hm/sils/git.nix
index 61093ac..f39a947 100644
--- a/modules/hm/sils/git.nix
+++ b/modules/hm/sils/git.nix
@@ -8,13 +8,46 @@
 in {
   options.sils.git.enable = lib.mkEnableOption "sils git config";
   config = lib.mkIf cfg.enable {
-    programs.git = {
-      enable = true;
-      package = pkgs.gitFull;
-      userName = "Silas Schöffel";
-      userEmail = "sils@sils.li";
+    programs = {
+      git = {
+        enable = true;
+        package = pkgs.gitFull;
+        userName = "Silas Schöffel";
+        userEmail = "sils@sils.li";
+        signing = {
+          key = "467B7D129EA73AC9";
+          signByDefault = false;
+        };
+        extraConfig = {
+          core = {
+            autocrlf = "input";
+          };
+          safe = {
+            directory = "/etc/nixos";
+          };
+          push = {
+            autoSetupRemote = true;
+          };
+          init = {
+            defaultBranch = "main";
+          };
+          commit = {
+            verbose = true;
+          };
+          sendemail = {
+            smtpserver = "mail.foss-syndicate.org";
+            smtpuser = "sils@sils.li";
+            smtpencryption = "ssl";
+            smtpserverport = "465";
+          };
+        };
+        aliases = {
+          recommit = "commit --file=.git/COMMIT_EDITMSG --edit";
+        };
+      };
       delta = {
         enable = true;
+        enableGitIntegration = true;
         options = {
           decorations = {
             commit-decoration-style = "bold purple box ul";
@@ -25,36 +58,6 @@ in {
           whitespace-error-style = "22 reverse";
         };
       };
-      signing = {
-        key = "467B7D129EA73AC9";
-        signByDefault = false;
-      };
-      extraConfig = {
-        core = {
-          autocrlf = "input";
-        };
-        safe = {
-          directory = "/etc/nixos";
-        };
-        push = {
-          autoSetupRemote = true;
-        };
-        init = {
-          defaultBranch = "main";
-        };
-        commit = {
-          verbose = true;
-        };
-        sendemail = {
-          smtpserver = "mail.foss-syndicate.org";
-          smtpuser = "sils@sils.li";
-          smtpencryption = "ssl";
-          smtpserverport = "465";
-        };
-      };
-      aliases = {
-        recommit = "commit --file=.git/COMMIT_EDITMSG --edit";
-      };
     };
   };
 }