From d7979bf77d8d62f65a3c86476ec6513ef2ac7581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 15 Apr 2025 13:01:23 +0200
Subject: [PATCH] fix(nvim): remove vim-jjdescription

It is now part of NeoVIM (since 0.11).

Also adjust the `draft_commit_description` as `jj` now supports the
`ignore-rest` comment.
---
 modules/hm/dev.nix            | 7 ++++---
 modules/nixvim/standalone.nix | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/hm/dev.nix b/modules/hm/dev.nix
index 5e765ff..2c2d898 100644
--- a/modules/hm/dev.nix
+++ b/modules/hm/dev.nix
@@ -72,13 +72,14 @@ in
                 templates.draft_commit_description = ''
                   concat(
                     description,
+                    "\n",
                     surround(
                       "\nJJ: This commit contains the following changes:\n", "",
-                      indent("JJ:     ", diff.stat(72)),
+                      indent("JJ:     ", diff.summary()),
                     ),
                     surround(
-                      "\nJJ: Diff:\n", "",
-                      indent("JJ:     ", diff.git()),
+                      "JJ: ignore-rest\n", "",
+                      diff.git(),
                     ),
                   )
                 '';
diff --git a/modules/nixvim/standalone.nix b/modules/nixvim/standalone.nix
index cec3117..8f4f63f 100644
--- a/modules/nixvim/standalone.nix
+++ b/modules/nixvim/standalone.nix
@@ -55,7 +55,6 @@ in
       extraPlugins = [
         plugins.nui-nvim
         plugins.nvim-web-devicons
-        plugins.vim-jjdescription # FIXME: included since neovim nightly
       ];
       extraPackages = [ pkgs.luajitPackages.jsregexp ];
       extraConfigLuaPre =