diff --git a/home/macos/home.nix b/home/macos/home.nix
index 4ad29c9..86c3d6e 100644
--- a/home/macos/home.nix
+++ b/home/macos/home.nix
@@ -28,11 +28,14 @@
   # Git configuration
   programs.git = {
     enable = true;
-    userName = lib.mkDefault "Timo Bingmann";
-    userEmail = lib.mkDefault "tbgit@panthema.net";
 
-    extraConfig = {
+    settings = {
+      user.name = "Timo Bingmann";
+      user.email = "tbingmann@ebay.com";
+
       credential.helper = "${pkgs.git}/bin/git-credential-osxkeychain";
+
+      commit.gpgsign = true;
     };
   };
 }
diff --git a/system/macos/fonts.nix b/system/macos/fonts.nix
index 7b381b0..7a1894d 100644
--- a/system/macos/fonts.nix
+++ b/system/macos/fonts.nix
@@ -7,9 +7,8 @@
       dejavu_fonts
       noto-fonts
       noto-fonts-cjk-sans
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       liberation_ttf
-      ubuntu_font_family
       ubuntu-sans
       ubuntu-classic
       ubuntu-sans-mono
@@ -26,7 +25,7 @@
 
       # Microsoft compatibility fonts
       corefonts
-      vistafonts
+      vista-fonts
 
       # Good programming fonts
       jetbrains-mono