jj update from work

home-manager/shared/programs/shell/git.nix

@@ -18,14 +18,6 @@
       signByDefault = false;
     };
     extraConfig.pull.rebase = true;
-    aliases = {
-      a = "add . -p";
-      s = "status";
-      f = "fetch";
-      d = "diff";
-      cm = "commit -m";
-      rb = "rebase -i";
-    };
   };
   programs.jujutsu = {
     enable = true;
@@ -34,17 +26,25 @@
         email = "cjriddz@protonmail.com";
         name = "iofq";
       };
+      operation = {
+        username = "iofq";
+      };
       ui = {
-        pager = "${pkgs.bat}/bin/bat";
         default-command = ["log"];
         conflict-marker-style = "git";
         merge-editor = "vimdiff";
+        diff.format  = "git";
+      };
+      merge-tools.vimdiff = {
+          program = "nvim";
       };
       snapshot = {
         max-new-file-size = "10MiB";
       };
-      git = {
-        subprocess = true;
+      aliases = {
+        tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@"];
+        ne = ["next" "--edit"];
+        be = ["edit" "-r" "@-"];
       };
     };
   };