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 =