justfile

@@ -17,7 +17,7 @@ bootstrap-home-manager target=(`whoami`+"@"+`hostname`):
     nix run --extra-experimental-features "nix-command flakes" --no-write-lock-file github:nix-community/home-manager/ -- --extra-experimental-features "nix-command flakes" --flake .#{{target}} switch
 
 format:
-    nix fmt ./
+    nix fmt
 
 home-gc:
     home-manager expire-generations -7days

modules/home-manager/git.nix

@@ -44,37 +44,36 @@
           line-numbers = true;
         };
       };
+      # difftastic.enable=true;
+      # difftastic.background="dark";
       userEmail = config.user.git.profile.email;
       userName = config.user.git.profile.name;
       extraConfig = {
-        init.defaultBranch = "main";
+        init = {
+          defaultBranch = "main";
+        };
         push = {
           autoSetupRemote = true;
-          default = "simple";
+          default = "current";
-          followTags = true;
         };
-        fetch = {
+        pull = {
-          prune = true;
+          ff = true;
-          pruneTags = true;
-          all = true;
         };
-        pull.ff = true;
+        merge = {
-        merge.conflictstyle = "zdiff3";
+          conflictstyle = "zdiff3";
-        diff = {
-          algorithm = "histogram";
-          colorMoved = "plain";
-          mnemonicPrefix = true;
-          renames = true;
         };
-        rerere = {
+        rebase = {
-          enabled = true;
+          autosquash = true;
-          autoupdate = true;
+        };
+        help = {
+          autocorrect = "prompt";
+        };
+        branch = {
+          sort = "-committerdate";
+        };
+        status = {
+          submodulesummary = true;
         };
-        rebase.autosquash = true;
-        help.autocorrect = "prompt";
-        branch.sort = "-committerdate";
-        tag.sort = "version:refname";
-        status.submodulesummary = true;
       };
       includes =
         if config.user.git.workProfile.enable