added git merge backup settings

home/browser.nix

@@ -39,13 +39,15 @@
         # ublock origin
         id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
         sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
-        version = "1.63.2";
+        # sha256 = lib.fakeSha256;
+        version = "1.64.0";
       })
       (createChromiumExtension {
         # bitwarden
         id = "nngceckbapebfimnlniiiahkandclblb";
         sha256 = "sha256:0jxk3cqmgd5qj8hnw7s0k5s4bfrcmr0w0rckp3x0bmng07azw4gi";
-        version = "2025.3.1";
+        # sha256 = lib.fakeSha256;
+        version = "2025.5.0";
       })
     ];
   };

home/git.nix

@@ -17,6 +17,7 @@
       push.autoSetupRemote = true;
       pull.merge = true;
       merge.tool = "nvimdiff";
+      mergetool.keepBackup = false;
     };
 
     ignores = [