diff --git a/common.nix b/common.nix
index 06ff44a..1dc37d2 100644
--- a/common.nix
+++ b/common.nix
@@ -509,7 +509,6 @@ in
       git = {
         enable = true;
         userName = "Leon Wilzer";
-        userEmail = "git@komu.boo";
         aliases = {
           ci = "commit";
           co = "checkout";
@@ -619,7 +618,7 @@ in
 
       gpg-agent = {
         enable = true;
-		enableSshSupport = false;
+        enableSshSupport = false;
       };
     };
     dconf.settings = {
diff --git a/home.nix b/home.nix
index f08f43c..890aac9 100644
--- a/home.nix
+++ b/home.nix
@@ -38,8 +38,11 @@ in
       };
     };
 
-  programs.git.signing = {
-    signByDefault = true;
-    key = "0x645EFCD19E59ED05";
+  programs.git = {
+    signing = {
+      signByDefault = true;
+      key = "0x645EFCD19E59ED05";
+    };
+    userEmail = "git@komu.boo";
   };
 }
diff --git a/work.nix b/work.nix
index dfe87e5..8ae99dd 100644
--- a/work.nix
+++ b/work.nix
@@ -37,8 +37,11 @@ in
       };
     };
 
-  programs.git.signing = {
-    signByDefault = true;
-    key = "0xBE429D525C136DEB";
+  programs.git = {
+    siging = {
+      signByDefault = true;
+      key = "0xBE429D525C136DEB";
+    };
+    userEmail = "lwilzer@mail.uni-paderborn.de";
   };
 }