1 files changed, 22 insertions, 14 deletions

diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index cfeb2b2..98ba513 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -119,16 +119,17 @@
 
   programs.git = {
     enable = true;
-    package = pkgs.gitAndTools.gitFull;
-    userEmail = "stuebinm@disroot.org";
-    userName = "stuebinm";
+    package = pkgs.gitFull;
 
     signing = {
       # signByDefault = true;
       key = "0x8FBE8AAD32FA12B7";
     };
 
-    extraConfig = {
+    settings = {
+      user.email = "stuebinm@disroot.org";
+      user.name = "stuebinm";
+
       log.showSignature = true;
       init.defaultBranch = "main";
       merge.conflictStyle = "zdiff3";
@@ -145,6 +146,11 @@
         colorMoved = "plain";
         mnemoicPrefix = true;
         renames = true;
+
+        "isabelle" = {
+          binary = true;
+          textconv = "isabelle2unicode";
+        };
       };
 
       alias = {
@@ -176,21 +182,23 @@
       "*.cpp merge=mergiraf"
       "*.hpp merge=mergiraf"
       "*.cs merge=mergiraf"
+      "*.thy diff=isabelle"
     ];
 
     # diff-so-fancy.enable = true;
     # difftastic.enable = true;
-    delta = {
-      enable = false;
-      options = {
-        decorations = {
-          commit-decoration-style = "bold yellow";
-          file-decoration-style = "bold blue";
-          file-style = "bold yellow";
-        };
-        features = "decorations line-numbers navigate";
-        whitespace-error-style = "22 reverse";
+  };
+
+  programs.delta = {
+    enable = false;
+    options = {
+      decorations = {
+        commit-decoration-style = "bold yellow";
+        file-decoration-style = "bold blue";
+        file-style = "bold yellow";
       };
+      features = "decorations line-numbers navigate";
+      whitespace-error-style = "22 reverse";
     };
   };