diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..19642b1
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Attila Oláh <attila@dorn.haus> <atl@google.com>
+Attila Oláh <attila@dorn.haus> <attila.olah@netstal.com>
+Attila Oláh <attila@dorn.haus> <attila@attilaolah.eu>
+Attila Oláh <attila@dorn.haus> <attila@jasen.org.rs>
+Attila Oláh <attila@dorn.haus> <attilaolah@gmail.com>
+Attila Oláh <attila@dorn.haus> <attilaolah@google.com>
+Attila Oláh <attila@dorn.haus> <me@aatiis.me>
+Renovate Bot <renovatebot@users.noreply.github.com> <29139614+renovate[bot]@users.noreply.github.com>
diff --git a/flake.lock b/flake.lock
index 4521e6c..1739088 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726985855,
-        "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
+        "lastModified": 1727383923,
+        "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
+        "rev": "ffe2d07e771580a005e675108212597e5b367d2d",
         "type": "github"
       },
       "original": {
@@ -92,11 +92,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1725535663,
-        "narHash": "sha256-hsvbU1utffVOFTRa3arPepv8en42VltR33L72vK3QVo=",
+        "lastModified": 1727254580,
+        "narHash": "sha256-JPms9Xhgr2R76vWEGmCvsBAoM0JUd4cQ2zl4pie+XAM=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "153977aab35a72f3e142e32aed6b268b659d18e1",
+        "rev": "9ea804788ca5b4852d7e045d7a57f8d413852ca0",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "lastModified": 1727348695,
+        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/programs/git.nix b/home-manager/programs/git.nix
index dce724e..98cc5e1 100644
--- a/home-manager/programs/git.nix
+++ b/home-manager/programs/git.nix
@@ -18,7 +18,7 @@
       co = "checkout";
       l = lib.concatStringsSep " " [
         "!git log"
-        "--pretty=format:\"%C(yellow)%h %Cred%ad %Cblue%al%Cgreen%d %Creset%s\""
+        "--pretty=format:\"%C(yellow)%h %Cred%ad %Cblue%aL%Cgreen%d %Creset%s\""
         "--date=short"
         "--decorate"
         "--graph"
@@ -29,6 +29,7 @@
       pull.rebase = true;
       push.autoSetupRemote = true;
       init.defaultBranch = "main";
+      log.mailmap = true;
       advice.skippedCherryPicks = false;
       credential.helper = "cache --timeout=3600";
     };