Add jjui

hm/git/default.nix

@@ -5,6 +5,7 @@ in
 {
   config = lib.mkIf cfg.enable {
     home.packages = [
+      (pkgs.callPackage ./jjui.nix {})
       (pkgs.writeShellApplication {
         name = "git-sync";
         text = (lib.strings.concatLines

hm/git/jjui.nix

@@ -0,0 +1,21 @@
+{ buildGoModule, fetchFromGitHub }:
+buildGoModule {
+  pname = "jjui";
+  version = "2024-11-28";
+
+  src = fetchFromGitHub {
+    owner = "GeoffreyFrogeye";
+    repo = "jjui";
+    rev = "push-sszqvsmvqxmy"; # base16 colors
+    sha256 = "sha256-jNi5Ek3Qy/MojlQXBNlqREy7UxnyMaJuUtKPysWBoNU=";
+  };
+
+  vendorHash = "sha256-kg5b3tzwyAhn00GwdUDf4OdYZvCJZHgkgpzHFWy5SxI=";
+
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/jjui
+  '';
+
+  doCheck = false; # Some tests are not working
+
+}

hm/scripts/jlab

@@ -209,17 +209,15 @@ elif sys.argv[1] in ("merge", "mr"):
         to_glab()
     elif sys.argv[2] == "checkout":
         # Bypass the original checkout command so it doesn't run git commands.
-        # If there's no commit on the branch, add one with the MR title
-        # so jj has a current bookmark.
         mr = glab_get_mr(sys.argv[3])
         jj.run("git", "fetch")
+        jj.run("new", mr.source_branch)
+        # If there's no commit on the branch, add one with the MR title
+        # so jj has a current bookmark.
         if len(jj.log(f"{mr.source_branch} | {mr.target_branch}")) == 1:
             title = re.sub(r"^(WIP|Draft): ", "", mr.title)
-            jj.run("new", mr.source_branch)
             jj.run("describe", "-m", title)
             jj.run("bookmark", "move", mr.source_branch)
-        else:
-            jj.run("edit", mr.source_branch)
     elif sys.argv[2] in (
         # If no MR number/branch is given, insert the current bookmark,
         # as the current branch concept doesn't exist in jj