diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 12626de..76dcc84 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -247,11 +247,11 @@
 
     programs.git = {
       enable = true;
-      userEmail = "chandler@chandlerswift.com";
-      userName = "Chandler Swift";
       lfs.enable = true;
       # TODO: delta or diff-so-fancy or difftastic
-      extraConfig = {
+      settings = {
+        user.name = "Chandler Swift;
+        user.email = "chandler@chandlerswift.com";
         init.defaultBranch = "main";
         pull.ff = "only";
         #init.templatedir = "~/.git-template"; # unsure what this was intended to do -- default hooks, maybe?
diff --git a/sam/configuration.nix b/sam/configuration.nix
index 2d9183c..9a5069e 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -169,10 +169,10 @@
 
     programs.git = {
       enable = true;
-      userName = "Chandler Swift";
       lfs.enable = true;
       # TODO: delta or diff-so-fancy or difftastic
-      extraConfig = {
+      settings = {
+        user.name = "Chandler Swift";
         help.autoCorrect = "prompt";
         init.defaultBranch = "main";
         diff.wsErrorHighlight = "all";