From c1e172a194578c5c2a5fb82573a2dfecf2da7ee3 Mon Sep 17 00:00:00 2001
From: Yadunand Prem <yadunand@yadunut.com>
Date: Tue, 14 Oct 2025 10:29:28 +0800
Subject: [PATCH] Update flake and fix breaking changes

---
 flake.lock                      | 42 ++++++++++++++++-----------------
 modules/home/git/default.nix    | 25 +++++++++++++-------
 modules/home/neovim/default.nix |  3 +--
 3 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index 46d3187..f20c379 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1754433428,
-        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+        "lastModified": 1760836749,
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+        "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758287904,
-        "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
+        "lastModified": 1760701190,
+        "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
+        "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1760948891,
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
         "type": "github"
       },
       "original": {
@@ -183,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759853171,
-        "narHash": "sha256-uqbhyXtqMbYIiMqVqUhNdSuh9AEEkiasoK3mIPIVRhk=",
+        "lastModified": 1761584077,
+        "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a09eb84fa9e33748432a5253102d01251f72d6d",
+        "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1759733170,
-        "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=",
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8913c168d1c56dc49a7718685968f38752171c3b",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -266,11 +266,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1759878636,
-        "narHash": "sha256-yKMf+iG5KmQkMamtT8wWNFwyjSiluHyH683OcpJh/kQ=",
+        "lastModified": 1761601333,
+        "narHash": "sha256-ZCHa784eMt2RCJBPlbvc40wDBh8uMLuda97OeSpl6Yo=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c074710027ce3047382326d1fcc1a4e174cccfcc",
+        "rev": "416de183067b939899813ca1a612ba26a28c9ab6",
         "type": "github"
       },
       "original": {
@@ -289,11 +289,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758662783,
-        "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
+        "lastModified": 1760652422,
+        "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
+        "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
         "type": "github"
       },
       "original": {
diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix
index f7a297e..a588262 100644
--- a/modules/home/git/default.nix
+++ b/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;
 
diff --git a/modules/home/neovim/default.nix b/modules/home/neovim/default.nix
index e8d2bb7..d854950 100644
--- a/modules/home/neovim/default.nix
+++ b/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" = {