flake update

Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>

flake.lock

@@ -232,11 +232,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761468550,
-        "narHash": "sha256-nY4vyN1QdHhC5Gj3545fI2Y7FSr/gs8ID4gPmF8HPww=",
+        "lastModified": 1761513701,
+        "narHash": "sha256-w7qOcQb1FSMZASvWe01r99QqZ5LnHO0k3rgs5ryyig0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1830716059bfee7cbcfbfcc38d7be98e482a5762",
+        "rev": "255b6a0ef2f488a2fad051361699cc67db57338c",
         "type": "github"
       },
       "original": {
@@ -421,11 +421,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761500659,
-        "narHash": "sha256-hgOT9DvpiH/GJgCRKtXZfj+CbvEsg3vy2BDkknJxEJ4=",
+        "lastModified": 1761528699,
+        "narHash": "sha256-XT8oTUrURT1myYtyq651RizuGixuLEYvCoEPo6wAOiM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7bb12d3c06e545aec77fb1242068c1bde089e791",
+        "rev": "9df0e174938fe27df6bb81e856a64f6e2db31670",
         "type": "github"
       },
       "original": {

modules/git/aliases.nix

@@ -1,5 +1,6 @@
 {
-  flake.modules.homeManager.base.programs.git.aliases = {
+  flake.modules.homeManager.base.programs.git = {
+    settings.aliases = {
       aa = "add --all";
       assume = "update-index --assume-unchanged";
       assumed = "!git ls-files -v | grep '^[hsmrck?]' | cut -c 3-";
@@ -47,4 +48,5 @@
       ureset = "!git reset --hard $(git upstream)";
       worktrees = "worktree list";
     };
+  };
 }

modules/git/defaults.nix

@@ -2,7 +2,7 @@
   flake.modules.homeManager.base =
     { config, ... }:
     {
-      programs.git.extraConfig = {
+      programs.git.settings = {
         branch = {
           autosetupmerge = true;
           autosetuprebase = "always";

modules/git/user.nix

@@ -2,7 +2,9 @@
 
 {
   flake.modules.homeManager.base.programs.git = {
-    userName = config.flake.meta.owner.name;
-    userEmail = config.flake.meta.owner.email;
+    settings.user = {
+      email = config.flake.meta.owner.email;
+      name = config.flake.meta.owner.name;
+    };
   };
 }