added git merge backup settings

update browser extensions
2025-06-12 13:01:59 -04:00 · 2025-06-01 14:28:28 -04:00
2 changed files with 5 additions and 2 deletions
@@ -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";
      })
    ];
  };
@@ -17,6 +17,7 @@
      push.autoSetupRemote = true;
      pull.merge = true;
      merge.tool = "nvimdiff";
+      mergetool.keepBackup = false;
    };

    ignores = [
Author	SHA1	Message	Date
wymiller	8785247675	added git merge backup settings	2025-06-12 13:01:59 -04:00
wymiller	4afb47e881	update browser extensions	2025-06-01 14:28:28 -04:00