diff --git a/configs/home-manager/zk.nix b/configs/home-manager/zk.nix
index b41d19e..2a46e87 100644
--- a/configs/home-manager/zk.nix
+++ b/configs/home-manager/zk.nix
@@ -18,9 +18,9 @@
         id-case = "lower";
       };
 
-      format.markdown={
-        link-format="wiki";
-        hashtags=true;
+      format.markdown = {
+        link-format = "wiki";
+        hashtags = true;
       };
 
       alias = {
diff --git a/configs/nixos/homepage.nix b/configs/nixos/homepage.nix
index 0a84eac..9d1cf82 100644
--- a/configs/nixos/homepage.nix
+++ b/configs/nixos/homepage.nix
@@ -124,10 +124,10 @@ in {
           }
           {
             Cyberchef = {
-              icon="sh-cyberchef.svg";
-              href="https://cyberchef.venberg.xyz";
-              siteMonitor= "https://cyberchef.venberg.xyz";
-              description= "a data toolbox";
+              icon = "sh-cyberchef.svg";
+              href = "https://cyberchef.venberg.xyz";
+              siteMonitor = "https://cyberchef.venberg.xyz";
+              description = "a data toolbox";
             };
           }
         ];
diff --git a/configs/nixos/miniserve-static.nix b/configs/nixos/miniserve-static.nix
index 1be11d8..c0854d3 100644
--- a/configs/nixos/miniserve-static.nix
+++ b/configs/nixos/miniserve-static.nix
@@ -4,8 +4,8 @@
   pkgs,
   lib,
   ...
-}:let
-  port="8080";
+}: let
+  port = "8080";
 in {
   systemd.services.miniserve = {
     wantedBy = ["multi-user.target"];
diff --git a/justfile b/justfile
index d7eb74c..e364627 100644
--- a/justfile
+++ b/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
diff --git a/modules/home-manager/git.nix b/modules/home-manager/git.nix
index ebb95dd..03dbb31 100644
--- a/modules/home-manager/git.nix
+++ b/modules/home-manager/git.nix
@@ -44,36 +44,37 @@
           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 = "current";
+          default = "simple";
+          followTags = true;
         };
-        pull = {
-          ff = true;
+        fetch = {
+          prune = true;
+          pruneTags = true;
+          all = true;
         };
-        merge = {
-          conflictstyle = "zdiff3";
+        pull.ff = true;
+        merge.conflictstyle = "zdiff3";
+        diff = {
+          algorithm = "histogram";
+          colorMoved = "plain";
+          mnemonicPrefix = true;
+          renames = true;
         };
-        rebase = {
-          autosquash = true;
-        };
-        help = {
-          autocorrect = "prompt";
-        };
-        branch = {
-          sort = "-committerdate";
-        };
-        status = {
-          submodulesummary = true;
+        rerere = {
+          enabled = true;
+          autoupdate = true;
         };
+        rebase.autosquash = true;
+        help.autocorrect = "prompt";
+        branch.sort = "-committerdate";
+        tag.sort = "version:refname";
+        status.submodulesummary = true;
       };
       includes =
         if config.user.git.workProfile.enable
diff --git a/templates/default.nix b/templates/default.nix
index 72a1a59..20bddf8 100644
--- a/templates/default.nix
+++ b/templates/default.nix
@@ -8,7 +8,7 @@
     description = "A flake containing a basic latex environment";
   };
   typst = {
-    path= ./typst;
+    path = ./typst;
     description = "A flake containing a basic typst environment";
   };
 }