Update flake and fix breaking changes

modules/home/git/default.nix

@@ -41,6 +41,10 @@ in
       jf = "jj git fetch";
       jp = "jj git push";
     };
+    programs.delta = {
+      enable = true;
+      enableGitIntegration = true;
+    };
     programs.git = {
       ignores = [
         ".DS_Store"
@@ -49,20 +53,25 @@ in
         "**/.claude/settings.local.json"
       ];
       enable = true;
-      userEmail = email;
-      userName = name;
-      delta.enable = true;
       lfs.enable = true;
 
-      extraConfig = lib.mkMerge [
+      settings = lib.mkMerge [
         {
           init.defaultBranch = "main";
+          user = {
+            email = email;
+            name = name;
+          };
 
-          pull.rebase = true;
-          pull.autostash = true;
+          pull = {
+            rebase = true;
+            autostash = true;
+          };
 
-          rebase.autostash = true;
-          rebase.autosquash = true;
+          rebase = {
+            autostash = true;
+            autosquash = true;
+          };
 
           push.autoSetupRemote = true;
 

modules/home/neovim/default.nix

@@ -21,7 +21,6 @@ in
       default = false;
       description = "Enable performance options";
       type = lib.types.bool;
-
     };
   };
 
@@ -264,7 +263,7 @@ in
         treesitter-context.enable = true;
         treesitter-textobjects = {
           enable = true;
-          move = {
+          settings.move = {
             enable = true;
             gotoNextStart = {
               "]m" = {