diff --git a/modules/pkgs/neovim/dashboard-gh-notify.nix b/modules/pkgs/neovim/dashboard-gh-notify.nix index b53fb8c..ab0fec6 100644 --- 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 index 05dbe8c..cd931b4 100644 --- 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 ]; };