diff --git a/program-homemanager.nix b/program-homemanager.nix
index ec511a0..c243a42 100644
--- a/program-homemanager.nix
+++ b/program-homemanager.nix
@@ -12,10 +12,12 @@ in
 
     programs.git = {
       enable = true;
-      userName = config.vars.hm_git_username;
-      userEmail = config.vars.usermail;
 
       settings = {
+        user = {
+          name = config.vars.hm_git_username;
+          email = config.vars.usermail;
+        };
         credential.helper = "store --file ~/.git-credentials";
       };
     };
@@ -51,12 +53,14 @@ in
     /* The home.stateVersion option does not have a default and must be set */
     home.stateVersion = config.vars.stateVersion;
     /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
-    programs.git.settings = {
+    programs.git = {
       enable = true;
-      userName  = config.vars.hm_git_username;
-      userEmail = config.vars.usermail;
-      extraConfig = {
-        credential.helper = "store";
+      settings = {
+        user = {
+          name = config.vars.hm_git_username;
+          email = config.vars.usermail;
+        };
+        credential.helper = "store --file ~/.git-credentials";
       };
     }; 
     programs.fzf.enable = true;