diff --git a/flake.lock b/flake.lock
index 7fc0049..0d8b90c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,11 +58,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1760813311,
+        "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
         "type": "github"
       },
       "original": {
@@ -135,11 +135,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760797298,
-        "narHash": "sha256-p+g2IbDAVdcN068VNxgvvdM/su0DatNohg28x0gqPRg=",
+        "lastModified": 1760929667,
+        "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "fc837be107e33f5debe7fecc5c597a8dab69d83b",
+        "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1760804956,
-        "narHash": "sha256-uF9+XqXqbkSEtRjaNVrwGYLBbB6zfVhNNSvh3TayzmM=",
+        "lastModified": 1760948182,
+        "narHash": "sha256-W4nmBnVXAo7oQJOSYP6UPzAN9yhcyNpsqtnBfWqLCGE=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "f17b783b7dee10fde7e412b90cacbac4dd76723a",
+        "rev": "8ca7c6d7c4ec99409add7ec320f311e3003e05a4",
         "type": "github"
       },
       "original": {
@@ -167,11 +167,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1760805413,
-        "narHash": "sha256-q3cJ6lgrP7qkBYuHFpfI0aiodJpLJemfX7y4GZNVWqo=",
+        "lastModified": 1760948199,
+        "narHash": "sha256-83PK/VFrpuLJLj9sGx4ImBFGa3Tyjjq+ctPxgw942+4=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "2e29d6539b7c212f78b67199992c2ed4259e3f5a",
+        "rev": "78d2f94d52a0ac1ee4324717bdecd6af3237b9dd",
         "type": "github"
       },
       "original": {
@@ -228,11 +228,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760807130,
-        "narHash": "sha256-M6v5LE/ntrXzLhaivgV/wgyM1zQVuTNFAqhnyc503Ew=",
+        "lastModified": 1760948006,
+        "narHash": "sha256-o2LB7S7wuop9b7V1qzXWp9k3QUxN4JPeGt132kCH2BI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d81b27c25433eb6d72d782d7a178bb86c0d2ba97",
+        "rev": "a88bf6ecb0abc5d6e6010d2ab99bfa0cc9d3de58",
         "type": "github"
       },
       "original": {
@@ -297,11 +297,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1760751718,
-        "narHash": "sha256-IXJeNw3l/zDT02chbp9lCmesPpBnby8aOcc6A0igLaA=",
+        "lastModified": 1760906375,
+        "narHash": "sha256-inbXtSqhaDOxvosjvt8hP/Az/wWwRCxjipH4x5DSD6A=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "f473cee0d00a8c78b90e417e5a8a658aa4a2fe78",
+        "rev": "5c1be58f6d938ff93516d00cc3d2c0def4d80198",
         "type": "github"
       },
       "original": {
@@ -375,11 +375,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760393368,
-        "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=",
+        "lastModified": 1760845571,
+        "narHash": "sha256-PwGzU3EOU65Ef1VvuNnVLie+l+P0g/fzf/PGUG82KbM=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437",
+        "rev": "9c9a9798be331ed3f4b2902933d7677d0659ee61",
         "type": "github"
       },
       "original": {
diff --git a/hosts/darwin/chidi/default.nix b/hosts/darwin/chidi/default.nix
index 09d2993..c89e559 100644
--- a/hosts/darwin/chidi/default.nix
+++ b/hosts/darwin/chidi/default.nix
@@ -18,7 +18,7 @@
   };
 
   home-manager.users.${user} = {
-    programs.git.userEmail = "christoph@tuist.dev";
+    programs.git.settings.user.email = "christoph@tuist.dev";
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/modules/darwin/home/ghostty.nix b/modules/darwin/home/ghostty.nix
index e3ea233..d890965 100644
--- a/modules/darwin/home/ghostty.nix
+++ b/modules/darwin/home/ghostty.nix
@@ -8,7 +8,7 @@
       window-padding-x = 8;
       window-padding-y = 2;
       window-padding-balance = true;
-      font-family = "Fira Code";
+      font-family = "Iosevka";
       font-size = 15.5;
       font-feature = [
         "-calt"
diff --git a/modules/home/git.nix b/modules/home/git.nix
index f2efdee..127442e 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -4,11 +4,8 @@ in {
   programs.git = {
     enable = true;
     ignores = ["*.swp"];
-    userName = name;
-    lfs = {
-      enable = true;
-    };
-    extraConfig = {
+    settings = {
+      user.name = name;
       init.defaultBranch = "main";
       core = {
         editor = "vim";
@@ -31,6 +28,9 @@ in {
         show = "delta";
       };
     };
+    lfs = {
+      enable = true;
+    };
   };
 
   home.shellAliases = {
diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix
index 0c0048e..5ae4361 100644
--- a/modules/home/ssh.nix
+++ b/modules/home/ssh.nix
@@ -6,11 +6,13 @@
 }: {
   programs.ssh = {
     enable = true;
+    enableDefaultConfig = false;
     includes = [
       (lib.mkIf pkgs.stdenv.hostPlatform.isLinux "/home/${user}/.ssh/config_external")
       (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin "/Users/${user}/.ssh/config_external")
     ];
     matchBlocks = {
+      "*" = {};
       "github.com" = {
         identitiesOnly = true;
         identityFile = [
diff --git a/modules/packages.nix b/modules/packages.nix
index b22f301..d8f8fe5 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -5,6 +5,7 @@ with pkgs; [
   alejandra
   amp-cli
   ast-grep
+  codex
   delta
   devenv
   dig
@@ -13,6 +14,7 @@ with pkgs; [
   fastfetch
   fd
   fira-code
+  iosevka
   gh
   git
   gnumake