From adc9fdbba901e669656f3635f237b4601d6a9791 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sun, 29 Sep 2024 19:40:08 +0200
Subject: [PATCH] jj: fancy status and diff on <M-s> and <M-S> respectively

---
 files/config/fish/vcs.fish |  6 ++++--
 home/dln/home.nix          | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/files/config/fish/vcs.fish b/files/config/fish/vcs.fish
index ae510d5..4859d3b 100644
--- a/files/config/fish/vcs.fish
+++ b/files/config/fish/vcs.fish
@@ -23,9 +23,11 @@ end
 
 function vcs_status
     if __jj_in_repo
-        jj status
         echo
-        jj log --limit=20 -T builtin_log_comfortable -r "(main..@) | (main..@)-"
+        printf '\e[38;5;240m\u2504%.0s\e[0m' (seq 1 (tput cols)) '\n'
+        jj show --stat
+        printf '\e[38;5;240m\u2504%.0s\e[0m' (seq 1 (tput cols)) '\n'
+        jj log --ignore-working-copy --limit=20 -T builtin_log_comfortable -r "(main..@) | (main..@)-"
     else
         git status -sb
     end
diff --git a/home/dln/home.nix b/home/dln/home.nix
index d2487f5..329f326 100644
--- a/home/dln/home.nix
+++ b/home/dln/home.nix
@@ -140,6 +140,16 @@ in
           fg = "bright black";
           bold = false;
         };
+
+        "diff added token" = {
+          bg = "#002200";
+          fg = "#66ffcc";
+          underline = false;
+        };
+        "diff removed token" = {
+          bg = "#220011";
+          underline = true;
+        };
       };
     };
   };