From d213b60f4eeb4c5c84c9f3265fd1fa4f9871f4cc Mon Sep 17 00:00:00 2001
From: Adam0 <alumail@protonmail.com>
Date: Thu, 16 Jul 2026 22:42:01 +0000
Subject: [PATCH] Fix github notifications neovim, use the correct cmds for jujutsu

---
 modules/pkgs/neovim/dashboard-gh-notify.nix | 8 +++++++-
 modules/programs/tui/neovim/components/jujutsu.nix | 8 +++++++-
 2 file(s) changed, 14 insertion(s)(+), 2 deletion(s)(-)

diff --git a/modules/pkgs/neovim/dashboard-gh-notify.nix b/modules/pkgs/neovim/dashboard-gh-notify.nix
--- a/modules/pkgs/neovim/dashboard-gh-notify.nix
+++ b/modules/pkgs/neovim/dashboard-gh-notify.nix
@@ -10,7 +10,13 @@
 
         GH_TOKEN="$(cat "$GH_TOKEN_FILE")"
         export GH_TOKEN
-        exec "${pkgs.lib.getExe pkgs.gh-notify}" "$@"
+
+        if ! output="$("${pkgs.lib.getExe pkgs.gh-notify}" "$@" 2>&1)"; then
+          printf 'Notifications unavailable\n'
+          exit 0
+        fi
+
+        printf '%s\n' "$output"
       '';
     };
   };
diff --git a/modules/programs/tui/neovim/components/jujutsu.nix b/modules/programs/tui/neovim/components/jujutsu.nix
--- a/modules/programs/tui/neovim/components/jujutsu.nix
+++ b/modules/programs/tui/neovim/components/jujutsu.nix
@@ -7,8 +7,8 @@
 
         cmd = [
           # keep-sorted start
+          "JjConflictChooseBase"
           "JjConflictChooseBoth"
-          "JjConflictChooseNone"
           "JjConflictChooseOurs"
           "JjConflictChooseTheirs"
           "JjConflictDiff"
@@ -31,9 +31,15 @@
         cmd = [
           # keep-sorted start
           "J"
+          "Jbrowse"
           "Jdiff"
+          "Jedit"
           "Jhdiff"
+          "Jread"
+          "Jsplit"
+          "Jtabedit"
           "Jvdiff"
+          "Jvsplit"
           # keep-sorted end
         ];
       };

--
tangled.sh