From eb59aa14e885c26c89bcf88ffa0c4bd3644771c4 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Nov 2025 12:31:19 +0000
Subject: [PATCH 01/29] pkgs: diff-flake: add nix-darwin support

---
 pkgs/diff-flake/diff-flake | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/diff-flake/diff-flake b/pkgs/diff-flake/diff-flake
index a2a3513..7a46151 100755
--- a/pkgs/diff-flake/diff-flake
+++ b/pkgs/diff-flake/diff-flake
@@ -24,6 +24,10 @@ current_system() {
     nix eval --raw --impure --expr 'builtins.currentSystem'
 }
 
+add_darwin() {
+    FLAKE_OUTPUTS+=("darwinConfigurations.\"$1\".config.system.build.toplevel")
+}
+
 add_home() {
     FLAKE_OUTPUTS+=("homeConfigurations.\"$1\".activationPackage")
 }
@@ -54,6 +58,10 @@ usage() {
     print_err "  -p, --previous-rev"
     print_err "    which git revision should be considered the 'previous' state,"
     print_err "    defaults to HEAD~"
+    print_err "  --darwin [name]"
+    print_err "    specify the name of a nix-darwin output configuration whose"
+    print_err "    closure should be diffed, can be used multiple times"
+    print_err "    if no host name is given, defaults to current hostname"
     print_err "  --home [name]"
     print_err "    specify the name of a home-manager output configuration whose"
     print_err "    closure should be diffed, can be used multiple times"
@@ -101,6 +109,14 @@ parse_args() {
                 PREVIOUS_REV="$(git rev-parse "$1")"
                 shift
                 ;;
+            --darwin)
+                if [ $# -gt 0 ] && ! is_option "$1"; then
+                    add_darwin "$1"
+                    shift
+                else
+                    add_darwin "$(hostname)"
+                fi
+                ;;
             --home)
                 if [ $# -gt 0 ] && ! is_option "$1"; then
                     add_home "$1"
@@ -138,6 +154,12 @@ parse_args() {
     done
 }
 
+list_darwin_configurations() {
+    nix eval '.#darwinConfigurations' \
+        --apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
+        --raw
+}
+
 list_home_configurations() {
     nix eval '.#homeConfigurations' \
         --apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
@@ -175,6 +197,9 @@ diff_output() {
 parse_args "$@"
 
 if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
+    for darwin in $(list_darwin_configurations); do
+        add_darwin "$darwin"
+    done
     for home in $(list_home_configurations); do
         add_home "$home"
     done

From fae47faaffc7ceace543d30c55e594ffe666c600 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Nov 2025 12:40:21 +0000
Subject: [PATCH 02/29] pkgs: diff-flake: add system-manager support

---
 pkgs/diff-flake/diff-flake | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/diff-flake/diff-flake b/pkgs/diff-flake/diff-flake
index 7a46151..bacee6e 100755
--- a/pkgs/diff-flake/diff-flake
+++ b/pkgs/diff-flake/diff-flake
@@ -41,6 +41,10 @@ add_shell() {
     FLAKE_OUTPUTS+=("devShells.\"$(current_system)\".\"$1\".inputDerivation")
 }
 
+add_system() {
+    FLAKE_OUTPUTS+=("systemConfigs.\"$1\".config.system.build.toplevel")
+}
+
 usage() {
     print_err "Usage: $0 [option]... [-- [nix build option]...]"
     print_err ""
@@ -74,6 +78,10 @@ usage() {
     print_err "    specify a specific devShell configuration name whose closure"
     print_err "    should be diffed, can be used multiple times"
     print_err "    if no name is given, defaults to 'default'"
+    print_err "  --system [name]"
+    print_err "    specify the name of a system-manager output configuration whose"
+    print_err "    closure should be diffed, can be used multiple times"
+    print_err "    if no host name is given, defaults to current hostname"
     print_err ""
     print_err "when no flake outputs are specified, automatically queries for"
     print_err "all NixOS configurations, and devShells for current system"
@@ -141,6 +149,14 @@ parse_args() {
                     add_shell "default"
                 fi
                 ;;
+            --system)
+                if [ $# -gt 0 ] && ! is_option "$1"; then
+                    add_system "$1"
+                    shift
+                else
+                    add_system "$(hostname)"
+                fi
+                ;;
             --)
                 NIX_BUILD_ARGS=("$@")
                 break
@@ -178,6 +194,12 @@ list_dev_shells() {
         --raw
 }
 
+list_system_configurations() {
+    nix eval '.#systemConfigs' \
+        --apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
+        --raw
+}
+
 diff_output() {
     local PREV NEW
     PREV="$(mktemp --dry-run)"
@@ -209,6 +231,9 @@ if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
     for shell in $(list_dev_shells); do
         add_shell "$shell"
     done
+    for system in $(list_system_configurations); do
+        add_system "$system"
+    done
 fi
 
 for out in "${FLAKE_OUTPUTS[@]}"; do

From e72a8b3f0f6ecaf3e05c40e664f8fd3f281283f0 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Nov 2025 12:42:03 +0000
Subject: [PATCH 03/29] pkgs: diff-flake: rename 'host' to 'nixos'

To avoid mixing them up with Nix-Darwin and System Manager hosts.
---
 pkgs/diff-flake/diff-flake | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/diff-flake/diff-flake b/pkgs/diff-flake/diff-flake
index bacee6e..f9290b9 100755
--- a/pkgs/diff-flake/diff-flake
+++ b/pkgs/diff-flake/diff-flake
@@ -32,7 +32,7 @@ add_home() {
     FLAKE_OUTPUTS+=("homeConfigurations.\"$1\".activationPackage")
 }
 
-add_host() {
+add_nixos() {
     FLAKE_OUTPUTS+=("nixosConfigurations.\"$1\".config.system.build.toplevel")
 }
 
@@ -70,7 +70,7 @@ usage() {
     print_err "    specify the name of a home-manager output configuration whose"
     print_err "    closure should be diffed, can be used multiple times"
     print_err "    if no configuration name is given, defaults to current username"
-    print_err "  --host [name]"
+    print_err "  --nixos [name]"
     print_err "    specify the name of a NixOS output configuration whose"
     print_err "    closure should be diffed, can be used multiple times"
     print_err "    if no host name is given, defaults to current hostname"
@@ -133,12 +133,12 @@ parse_args() {
                     add_home "$USER"
                 fi
                 ;;
-            --host)
+            --nixos)
                 if [ $# -gt 0 ] && ! is_option "$1"; then
-                    add_host "$1"
+                    add_nixos "$1"
                     shift
                 else
-                    add_host "$(hostname)"
+                    add_nixos "$(hostname)"
                 fi
                 ;;
             --shell)
@@ -225,8 +225,8 @@ if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
     for home in $(list_home_configurations); do
         add_home "$home"
     done
-    for host in $(list_nixos_configurations); do
-        add_host "$host"
+    for nixos in $(list_nixos_configurations); do
+        add_nixos "$nixos"
     done
     for shell in $(list_dev_shells); do
         add_shell "$shell"

From 5d511a029c0237a06a30692c3b6883e2a2ef2a65 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Feb 2025 10:51:31 +0000
Subject: [PATCH 04/29] home: add jujutsu

This is a very basic configuration, still missing most bells and
whistles.
---
 modules/home/default.nix         |  1 +
 modules/home/jujutsu/default.nix | 67 ++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 modules/home/jujutsu/default.nix

diff --git a/modules/home/default.nix b/modules/home/default.nix
index ad3b979..eb3d0f2 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -24,6 +24,7 @@
     ./gtk
     ./htop
     ./jq
+    ./jujutsu
     ./keyboard
     ./mail
     ./mpv
diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
new file mode 100644
index 0000000..eaf56e9
--- /dev/null
+++ b/modules/home/jujutsu/default.nix
@@ -0,0 +1,67 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.my.home.jujutsu;
+
+  inherit (lib.my) mkMailAddress;
+in
+{
+  options.my.home.jujutsu = with lib; {
+    enable = my.mkDisableOption "jujutsu configuration";
+
+    package = mkPackageOption pkgs "jujutsu" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        # For `jj git` commands
+        assertion = cfg.enable -> config.my.home.git.enable;
+        message = ''
+          `config.my.home.jujutsu` relies on `config.my.home.git` being enabled.
+        '';
+      }
+    ];
+
+    programs.jujutsu = {
+      enable = true;
+
+      inherit (cfg) package;
+
+      settings = {
+        # Who am I?
+        user = {
+          name = "Bruno BELANYI";
+          email = mkMailAddress "bruno" "belanyi.fr";
+        };
+
+        aliases = {
+          jj = [ "util" "exec" "--" "jj" ];
+          lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
+          lola = [ "lol" "-r" "all()" ];
+        };
+
+        "--scope" = [
+          # Multiple identities
+          {
+            "--when" = {
+              repositories = [ "~/git/EPITA/" ];
+            };
+            user = {
+              name = "Bruno BELANYI";
+              email = mkMailAddress "bruno.belanyi" "epita.fr";
+            };
+          }
+          {
+            "--when" = {
+              repositories = [ "~/git/work/" ];
+            };
+            user = {
+              name = "Bruno BELANYI";
+              email = mkMailAddress "ambroisie" "google.com";
+            };
+          }
+        ];
+      };
+    };
+  };
+}

From 0ba3d37813dfd694e7d1c297316db2e6dbaad9e0 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Feb 2025 10:51:31 +0000
Subject: [PATCH 05/29] home: delta: add 'jujutsu.enable'

---
 modules/home/delta/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/home/delta/default.nix b/modules/home/delta/default.nix
index e76edc6..f652632 100644
--- a/modules/home/delta/default.nix
+++ b/modules/home/delta/default.nix
@@ -11,6 +11,10 @@ in
     git = {
       enable = my.mkDisableOption "git integration";
     };
+
+    jujutsu = {
+      enable = my.mkDisableOption "jujutsu integration";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -20,6 +24,9 @@ in
       inherit (cfg) package;
 
       enableGitIntegration = cfg.git.enable;
+      # `jj log -p` does not use `delta`
+      # https://github.com/jj-vcs/jj/issues/4142
+      enableJujutsuIntegration = cfg.jujutsu.enable;
 
       options = {
         features = "diff-highlight decorations";

From 21a5705631fc74b80bc2d19ed6430315d142f698 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Mar 2025 12:43:12 +0000
Subject: [PATCH 06/29] home: jj: use verbose draft commit messages

---
 modules/home/jujutsu/default.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index eaf56e9..ff07448 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -40,6 +40,28 @@ in
           lola = [ "lol" "-r" "all()" ];
         };
 
+        templates = {
+          # Equivalent to `commit.verbose = true` in Git
+          draft_commit_description = "commit_description_verbose(self)";
+        };
+
+        template-aliases = {
+          "commit_description_verbose(commit)" = ''
+            concat(
+              commit_description(commit),
+              "JJ: ignore-rest\n",
+              diff.git(),
+            )
+          '';
+          "commit_description(commit)" = ''
+            concat(
+              commit.description(), "\n",
+              "JJ: This commit contains the following changes:\n",
+              indent("JJ:    ", diff.stat(72)),
+            )
+          '';
+        };
+
         "--scope" = [
           # Multiple identities
           {

From 7a406520e14407847158bafe0b66e610f51fe31c Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 18 Mar 2025 14:59:23 +0000
Subject: [PATCH 07/29] home: jujutsu: explicitly create 'conf.d'

This is to serve as a reminder of _how_ to add a local configuration
file.
---
 modules/home/jujutsu/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index ff07448..573c588 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -85,5 +85,10 @@ in
         ];
       };
     };
+
+    # To drop in a `local.toml` configuration, not-versioned
+    xdg.configFile = {
+      "jj/conf.d/.keep".text = "";
+    };
   };
 }

From ae21b934247827283c752fd757d8fcf70c0732de Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 11 Jul 2025 10:49:29 +0000
Subject: [PATCH 08/29] home: jujutsu: simplify 'jj jj' alias

---
 modules/home/jujutsu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 573c588..0c02813 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -35,7 +35,7 @@ in
         };
 
         aliases = {
-          jj = [ "util" "exec" "--" "jj" ];
+          jj = [ ];
           lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
           lola = [ "lol" "-r" "all()" ];
         };

From 2a7957efeacbec5e042f4ad02c4c8ef17fb4e689 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 22 Aug 2025 11:32:57 +0000
Subject: [PATCH 09/29] homes: bazin: use system jujutsu

They have a custom `jj` with Piper CitC integration.
---
 hosts/homes/ambroisie@bazin/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hosts/homes/ambroisie@bazin/default.nix b/hosts/homes/ambroisie@bazin/default.nix
index 365b70d..9ef2642 100644
--- a/hosts/homes/ambroisie@bazin/default.nix
+++ b/hosts/homes/ambroisie@bazin/default.nix
@@ -22,6 +22,10 @@
       package = pkgs.emptyDirectory;
     };
 
+    jujutsu = {
+      package = pkgs.emptyDirectory;
+    };
+
     tmux = {
       # I use scripts that use the passthrough sequence often on this host
       enablePassthrough = true;

From 15687fc8b022965a62910ad2fdca99ee803367a3 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 22 Aug 2025 11:32:57 +0000
Subject: [PATCH 10/29] homes: mousqueton: use system jujutsu

They have a custom `jj` with Piper CitC integration.
---
 hosts/homes/ambroisie@mousqueton/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hosts/homes/ambroisie@mousqueton/default.nix b/hosts/homes/ambroisie@mousqueton/default.nix
index 1383618..1ffee2b 100644
--- a/hosts/homes/ambroisie@mousqueton/default.nix
+++ b/hosts/homes/ambroisie@mousqueton/default.nix
@@ -25,6 +25,10 @@
       package = pkgs.emptyDirectory;
     };
 
+    jujutsu = {
+      package = pkgs.emptyDirectory;
+    };
+
     tmux = {
       # I use scripts that use the passthrough sequence often on this host
       enablePassthrough = true;

From 50f95ce1e1def640ab793fecaaaa2e8b6736f9b9 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 27 Oct 2025 12:34:07 +0000
Subject: [PATCH 11/29] home: jujutsu: set 'ui.diff-editor'

Otherwise it keeps nagging me with a hint to set it.

I'm not a big fan of this UI, I wish I add something closer to Git's
patch interface.
---
 modules/home/jujutsu/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 0c02813..7d44352 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -40,6 +40,11 @@ in
           lola = [ "lol" "-r" "all()" ];
         };
 
+        ui = {
+          # Stop nagging me about it, though I am not a fan of its UI.
+          diff-editor = ":builtin";
+        };
+
         templates = {
           # Equivalent to `commit.verbose = true` in Git
           draft_commit_description = "commit_description_verbose(self)";

From a008c9b73b3c231b0766051ca92b45d2bf0bd3b3 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Nov 2025 11:13:10 +0000
Subject: [PATCH 12/29] home: jujutsu: set 'ui.merge-editor'

Same reason as `ui.diff-editor`.
---
 modules/home/jujutsu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 7d44352..7d1928d 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -43,6 +43,8 @@ in
         ui = {
           # Stop nagging me about it, though I am not a fan of its UI.
           diff-editor = ":builtin";
+          # Stop nagging me about it, though I am not a fan of its UI.
+          merge-editor = ":builtin";
         };
 
         templates = {

From ccf222eb9cc37fc7af4bf184c55b94eebdaa19db Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Feb 2025 10:51:31 +0000
Subject: [PATCH 13/29] WIP: ADD NOTE FOR FUTURE SELF

---
 modules/home/jujutsu/default.nix | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 7d1928d..a8419f5 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -36,8 +36,16 @@ in
 
         aliases = {
           jj = [ ];
+          # FIXME:
+          # * still not a big fan of the template
           lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
           lola = [ "lol" "-r" "all()" ];
+          # FIXME: equivalent to `git switch -`
+          # See https://github.com/jj-vcs/jj/issues/2871
+          # Might be broken recently https://discord.com/channels/968932220549103686/1380272574709366989/1380432041983606855
+          # TODO:
+          # * `pick` (https://github.com/jj-vcs/jj/issues/5446): [ "util" "exec" "--" "bash" "-c" "jj log -p -r \"diff_contains($1)\"" "" ]
+          # * `root`: `jj workspace root` (barely necessary then)
         };
 
         ui = {
@@ -47,6 +55,31 @@ in
           merge-editor = ":builtin";
         };
 
+        # FIXME: git equivalents
+        # I'd like a better formatted blame (more like delta's?)
+        # blame = {
+        #   coloring = "repeatedLines";
+        #   markIgnoredLines = true;
+        #   markUnblamables = true;
+        # };
+        # FIXME: log colors should probably match git
+        # FIXME: patience diff?
+        # FIXME: fetch prune/pruneTags?
+        # FIXME: pull.rebase=true? Probably true TBH
+        # FIXME: push.default=simple? Probably true TBH
+        # FIXME: conflict style? ui.conflict-marker-style=git is diff3, not zdiff3. Default looks fine-ish
+
+        # FIXME: from ma_9's config, plus my own stuff
+        # snapshot = {
+        #   auto-track = "none()";
+        # };
+        #
+        # ui = {
+        #   movement = {
+        #     edit = false;
+        #   };
+        # };
+
         templates = {
           # Equivalent to `commit.verbose = true` in Git
           draft_commit_description = "commit_description_verbose(self)";
@@ -60,6 +93,9 @@ in
               diff.git(),
             )
           '';
+          # FIXME: use `diff.summary()` instead? Supported by syntax highlighting
+          # See https://github.com/jj-vcs/jj/issues/1946#issuecomment-2572986485
+          # FIXME: tree-sitter grammar isn't in `nvim-treesitter` (https://github.com/kareigu/tree-sitter-jjdescription)
           "commit_description(commit)" = ''
             concat(
               commit.description(), "\n",

From a1d08876a875bc46b9e9827ac9fe14421dc0440d Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 2 Dec 2025 12:34:42 +0000
Subject: [PATCH 14/29] nixos: hardware: graphics: remove 'amdvlk'

It's been fully deprecated, the package was removed.
---
 modules/nixos/hardware/graphics/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/modules/nixos/hardware/graphics/default.nix b/modules/nixos/hardware/graphics/default.nix
index 7d8b359..4b6eb37 100644
--- a/modules/nixos/hardware/graphics/default.nix
+++ b/modules/nixos/hardware/graphics/default.nix
@@ -15,8 +15,6 @@ in
 
     amd = {
       enableKernelModule = lib.my.mkDisableOption "Kernel driver module";
-
-      amdvlk = lib.mkEnableOption "Use AMDVLK instead of Mesa RADV driver";
     };
 
     intel = {
@@ -35,13 +33,6 @@ in
     (lib.mkIf (cfg.gpuFlavor == "amd") {
       hardware.amdgpu = {
         initrd.enable = cfg.amd.enableKernelModule;
-        # Vulkan
-        amdvlk = lib.mkIf cfg.amd.amdvlk {
-          enable = true;
-          support32Bit = {
-            enable = true;
-          };
-        };
       };
 
       hardware.graphics = {

From d21fdfb227c93c941852d7569a6eb71b7441c4c6 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Nov 2025 12:31:19 +0000
Subject: [PATCH 15/29] pkgs: diff-flake: add nix-darwin support

---
 pkgs/diff-flake/diff-flake | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/diff-flake/diff-flake b/pkgs/diff-flake/diff-flake
index a2a3513..7a46151 100755
--- a/pkgs/diff-flake/diff-flake
+++ b/pkgs/diff-flake/diff-flake
@@ -24,6 +24,10 @@ current_system() {
     nix eval --raw --impure --expr 'builtins.currentSystem'
 }
 
+add_darwin() {
+    FLAKE_OUTPUTS+=("darwinConfigurations.\"$1\".config.system.build.toplevel")
+}
+
 add_home() {
     FLAKE_OUTPUTS+=("homeConfigurations.\"$1\".activationPackage")
 }
@@ -54,6 +58,10 @@ usage() {
     print_err "  -p, --previous-rev"
     print_err "    which git revision should be considered the 'previous' state,"
     print_err "    defaults to HEAD~"
+    print_err "  --darwin [name]"
+    print_err "    specify the name of a nix-darwin output configuration whose"
+    print_err "    closure should be diffed, can be used multiple times"
+    print_err "    if no host name is given, defaults to current hostname"
     print_err "  --home [name]"
     print_err "    specify the name of a home-manager output configuration whose"
     print_err "    closure should be diffed, can be used multiple times"
@@ -101,6 +109,14 @@ parse_args() {
                 PREVIOUS_REV="$(git rev-parse "$1")"
                 shift
                 ;;
+            --darwin)
+                if [ $# -gt 0 ] && ! is_option "$1"; then
+                    add_darwin "$1"
+                    shift
+                else
+                    add_darwin "$(hostname)"
+                fi
+                ;;
             --home)
                 if [ $# -gt 0 ] && ! is_option "$1"; then
                     add_home "$1"
@@ -138,6 +154,12 @@ parse_args() {
     done
 }
 
+list_darwin_configurations() {
+    nix eval '.#darwinConfigurations' \
+        --apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
+        --raw
+}
+
 list_home_configurations() {
     nix eval '.#homeConfigurations' \
         --apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
@@ -175,6 +197,9 @@ diff_output() {
 parse_args "$@"
 
 if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
+    for darwin in $(list_darwin_configurations); do
+        add_darwin "$darwin"
+    done
     for home in $(list_home_configurations); do
         add_home "$home"
     done

From cc27fe019840d9730d445763bcc6ee7d72fec1e4 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Nov 2025 12:40:21 +0000
Subject: [PATCH 16/29] pkgs: diff-flake: add system-manager support

---
 pkgs/diff-flake/diff-flake | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/diff-flake/diff-flake b/pkgs/diff-flake/diff-flake
index 7a46151..bacee6e 100755
--- a/pkgs/diff-flake/diff-flake
+++ b/pkgs/diff-flake/diff-flake
@@ -41,6 +41,10 @@ add_shell() {
     FLAKE_OUTPUTS+=("devShells.\"$(current_system)\".\"$1\".inputDerivation")
 }
 
+add_system() {
+    FLAKE_OUTPUTS+=("systemConfigs.\"$1\".config.system.build.toplevel")
+}
+
 usage() {
     print_err "Usage: $0 [option]... [-- [nix build option]...]"
     print_err ""
@@ -74,6 +78,10 @@ usage() {
     print_err "    specify a specific devShell configuration name whose closure"
     print_err "    should be diffed, can be used multiple times"
     print_err "    if no name is given, defaults to 'default'"
+    print_err "  --system [name]"
+    print_err "    specify the name of a system-manager output configuration whose"
+    print_err "    closure should be diffed, can be used multiple times"
+    print_err "    if no host name is given, defaults to current hostname"
     print_err ""
     print_err "when no flake outputs are specified, automatically queries for"
     print_err "all NixOS configurations, and devShells for current system"
@@ -141,6 +149,14 @@ parse_args() {
                     add_shell "default"
                 fi
                 ;;
+            --system)
+                if [ $# -gt 0 ] && ! is_option "$1"; then
+                    add_system "$1"
+                    shift
+                else
+                    add_system "$(hostname)"
+                fi
+                ;;
             --)
                 NIX_BUILD_ARGS=("$@")
                 break
@@ -178,6 +194,12 @@ list_dev_shells() {
         --raw
 }
 
+list_system_configurations() {
+    nix eval '.#systemConfigs' \
+        --apply 'attrs: with builtins; concatStringsSep "\n" (attrNames attrs)' \
+        --raw
+}
+
 diff_output() {
     local PREV NEW
     PREV="$(mktemp --dry-run)"
@@ -209,6 +231,9 @@ if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
     for shell in $(list_dev_shells); do
         add_shell "$shell"
     done
+    for system in $(list_system_configurations); do
+        add_system "$system"
+    done
 fi
 
 for out in "${FLAKE_OUTPUTS[@]}"; do

From 92d9f37ef2f943f7acc703c857e7c13229451b87 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Nov 2025 12:42:03 +0000
Subject: [PATCH 17/29] pkgs: diff-flake: rename 'host' to 'nixos'

To avoid mixing them up with Nix-Darwin and System Manager hosts.
---
 pkgs/diff-flake/diff-flake | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/diff-flake/diff-flake b/pkgs/diff-flake/diff-flake
index bacee6e..f9290b9 100755
--- a/pkgs/diff-flake/diff-flake
+++ b/pkgs/diff-flake/diff-flake
@@ -32,7 +32,7 @@ add_home() {
     FLAKE_OUTPUTS+=("homeConfigurations.\"$1\".activationPackage")
 }
 
-add_host() {
+add_nixos() {
     FLAKE_OUTPUTS+=("nixosConfigurations.\"$1\".config.system.build.toplevel")
 }
 
@@ -70,7 +70,7 @@ usage() {
     print_err "    specify the name of a home-manager output configuration whose"
     print_err "    closure should be diffed, can be used multiple times"
     print_err "    if no configuration name is given, defaults to current username"
-    print_err "  --host [name]"
+    print_err "  --nixos [name]"
     print_err "    specify the name of a NixOS output configuration whose"
     print_err "    closure should be diffed, can be used multiple times"
     print_err "    if no host name is given, defaults to current hostname"
@@ -133,12 +133,12 @@ parse_args() {
                     add_home "$USER"
                 fi
                 ;;
-            --host)
+            --nixos)
                 if [ $# -gt 0 ] && ! is_option "$1"; then
-                    add_host "$1"
+                    add_nixos "$1"
                     shift
                 else
-                    add_host "$(hostname)"
+                    add_nixos "$(hostname)"
                 fi
                 ;;
             --shell)
@@ -225,8 +225,8 @@ if [ "${#FLAKE_OUTPUTS[@]}" -eq 0 ]; then
     for home in $(list_home_configurations); do
         add_home "$home"
     done
-    for host in $(list_nixos_configurations); do
-        add_host "$host"
+    for nixos in $(list_nixos_configurations); do
+        add_nixos "$nixos"
     done
     for shell in $(list_dev_shells); do
         add_shell "$shell"

From 1b0e1a46923f3619cc7c1364744c04d2382622d2 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Feb 2025 10:51:31 +0000
Subject: [PATCH 18/29] home: add jujutsu

This is a very basic configuration, still missing most bells and
whistles.
---
 modules/home/default.nix         |  1 +
 modules/home/jujutsu/default.nix | 67 ++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 modules/home/jujutsu/default.nix

diff --git a/modules/home/default.nix b/modules/home/default.nix
index ad3b979..eb3d0f2 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -24,6 +24,7 @@
     ./gtk
     ./htop
     ./jq
+    ./jujutsu
     ./keyboard
     ./mail
     ./mpv
diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
new file mode 100644
index 0000000..eaf56e9
--- /dev/null
+++ b/modules/home/jujutsu/default.nix
@@ -0,0 +1,67 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.my.home.jujutsu;
+
+  inherit (lib.my) mkMailAddress;
+in
+{
+  options.my.home.jujutsu = with lib; {
+    enable = my.mkDisableOption "jujutsu configuration";
+
+    package = mkPackageOption pkgs "jujutsu" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        # For `jj git` commands
+        assertion = cfg.enable -> config.my.home.git.enable;
+        message = ''
+          `config.my.home.jujutsu` relies on `config.my.home.git` being enabled.
+        '';
+      }
+    ];
+
+    programs.jujutsu = {
+      enable = true;
+
+      inherit (cfg) package;
+
+      settings = {
+        # Who am I?
+        user = {
+          name = "Bruno BELANYI";
+          email = mkMailAddress "bruno" "belanyi.fr";
+        };
+
+        aliases = {
+          jj = [ "util" "exec" "--" "jj" ];
+          lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
+          lola = [ "lol" "-r" "all()" ];
+        };
+
+        "--scope" = [
+          # Multiple identities
+          {
+            "--when" = {
+              repositories = [ "~/git/EPITA/" ];
+            };
+            user = {
+              name = "Bruno BELANYI";
+              email = mkMailAddress "bruno.belanyi" "epita.fr";
+            };
+          }
+          {
+            "--when" = {
+              repositories = [ "~/git/work/" ];
+            };
+            user = {
+              name = "Bruno BELANYI";
+              email = mkMailAddress "ambroisie" "google.com";
+            };
+          }
+        ];
+      };
+    };
+  };
+}

From 1fb09cdb0d341920d47850acab70492f7dc6005b Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Feb 2025 10:51:31 +0000
Subject: [PATCH 19/29] home: delta: add 'jujutsu.enable'

---
 modules/home/delta/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/home/delta/default.nix b/modules/home/delta/default.nix
index e76edc6..f652632 100644
--- a/modules/home/delta/default.nix
+++ b/modules/home/delta/default.nix
@@ -11,6 +11,10 @@ in
     git = {
       enable = my.mkDisableOption "git integration";
     };
+
+    jujutsu = {
+      enable = my.mkDisableOption "jujutsu integration";
+    };
   };
 
   config = lib.mkIf cfg.enable {
@@ -20,6 +24,9 @@ in
       inherit (cfg) package;
 
       enableGitIntegration = cfg.git.enable;
+      # `jj log -p` does not use `delta`
+      # https://github.com/jj-vcs/jj/issues/4142
+      enableJujutsuIntegration = cfg.jujutsu.enable;
 
       options = {
         features = "diff-highlight decorations";

From f16195cc99aa2ec9f50ab02c8860cfa67e74ed48 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 4 Dec 2025 13:55:01 +0000
Subject: [PATCH 20/29] home: jujutsu: set 'ui.diff-formatter'

I *still* don't really like the built-in formatting, but it's more about
its highlighting than its syntax.

Given that I default to using `delta` anyways, it doesn't _really_
matter as I don't see the default output.
---
 modules/home/jujutsu/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index eaf56e9..fd8f84c 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -40,6 +40,11 @@ in
           lola = [ "lol" "-r" "all()" ];
         };
 
+        ui = {
+          # I don't like word-diff
+          diff-formatter = ":git";
+        };
+
         "--scope" = [
           # Multiple identities
           {

From 6ba4dcf324205281ceef278fc94755555ca25982 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 4 Dec 2025 12:48:58 +0000
Subject: [PATCH 21/29] home: jujutsu: set 'ui.pager'

The v0.36 release stopped honoring `$PAGER`. So enforce it in the
configuration (as I don't like their default pager settings).

Ideally this would be `mkIf`ed behind `my.home.pager.enable`, however it
looks like this does not work with the TOML type (does not seem to do
any `mkMerge`-ish logic).
---
 modules/home/jujutsu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index fd8f84c..8d4141c 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -43,6 +43,8 @@ in
         ui = {
           # I don't like word-diff
           diff-formatter = ":git";
+          # Does not honor `$PAGER` (anymore)
+          pager = lib.mkDefault config.home.sessionVariables.PAGER;
         };
 
         "--scope" = [

From 8836f0f3ecf86f29ab9403bc3bf566a0223ce239 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 17 Mar 2025 12:43:12 +0000
Subject: [PATCH 22/29] home: jj: use verbose draft commit messages

---
 modules/home/jujutsu/default.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 8d4141c..206cc2b 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -47,6 +47,28 @@ in
           pager = lib.mkDefault config.home.sessionVariables.PAGER;
         };
 
+        templates = {
+          # Equivalent to `commit.verbose = true` in Git
+          draft_commit_description = "commit_description_verbose(self)";
+        };
+
+        template-aliases = {
+          "commit_description_verbose(commit)" = ''
+            concat(
+              commit_description(commit),
+              "JJ: ignore-rest\n",
+              diff.git(),
+            )
+          '';
+          "commit_description(commit)" = ''
+            concat(
+              commit.description(), "\n",
+              "JJ: This commit contains the following changes:\n",
+              indent("JJ:    ", diff.stat(72)),
+            )
+          '';
+        };
+
         "--scope" = [
           # Multiple identities
           {

From e2ae52f2f69be351b7b5f87a88792692cd00730b Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 18 Mar 2025 14:59:23 +0000
Subject: [PATCH 23/29] home: jujutsu: explicitly create 'conf.d'

This is to serve as a reminder of _how_ to add a local configuration
file.
---
 modules/home/jujutsu/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 206cc2b..4112dc0 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -92,5 +92,10 @@ in
         ];
       };
     };
+
+    # To drop in a `local.toml` configuration, not-versioned
+    xdg.configFile = {
+      "jj/conf.d/.keep".text = "";
+    };
   };
 }

From 5fd02826be72542f2a2d167e6a26f584f3f807a1 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 11 Jul 2025 10:49:29 +0000
Subject: [PATCH 24/29] home: jujutsu: simplify 'jj jj' alias

---
 modules/home/jujutsu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 4112dc0..2eec27e 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -35,7 +35,7 @@ in
         };
 
         aliases = {
-          jj = [ "util" "exec" "--" "jj" ];
+          jj = [ ];
           lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
           lola = [ "lol" "-r" "all()" ];
         };

From 712411afdb74c364df07f6b0677c19b076ab0d3e Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 22 Aug 2025 11:32:57 +0000
Subject: [PATCH 25/29] homes: bazin: use system jujutsu

They have a custom `jj` with Piper CitC integration.
---
 hosts/homes/ambroisie@bazin/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hosts/homes/ambroisie@bazin/default.nix b/hosts/homes/ambroisie@bazin/default.nix
index 365b70d..9ef2642 100644
--- a/hosts/homes/ambroisie@bazin/default.nix
+++ b/hosts/homes/ambroisie@bazin/default.nix
@@ -22,6 +22,10 @@
       package = pkgs.emptyDirectory;
     };
 
+    jujutsu = {
+      package = pkgs.emptyDirectory;
+    };
+
     tmux = {
       # I use scripts that use the passthrough sequence often on this host
       enablePassthrough = true;

From b93167c6af042c32e4704e9e5a64fdfa23e804c7 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 22 Aug 2025 11:32:57 +0000
Subject: [PATCH 26/29] homes: mousqueton: use system jujutsu

They have a custom `jj` with Piper CitC integration.
---
 hosts/homes/ambroisie@mousqueton/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hosts/homes/ambroisie@mousqueton/default.nix b/hosts/homes/ambroisie@mousqueton/default.nix
index 1383618..1ffee2b 100644
--- a/hosts/homes/ambroisie@mousqueton/default.nix
+++ b/hosts/homes/ambroisie@mousqueton/default.nix
@@ -25,6 +25,10 @@
       package = pkgs.emptyDirectory;
     };
 
+    jujutsu = {
+      package = pkgs.emptyDirectory;
+    };
+
     tmux = {
       # I use scripts that use the passthrough sequence often on this host
       enablePassthrough = true;

From 7e2da79de3f24d030e07493fd8cd360cd8b9153d Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 27 Oct 2025 12:34:07 +0000
Subject: [PATCH 27/29] home: jujutsu: set 'ui.diff-editor'

Otherwise it keeps nagging me with a hint to set it.

I'm not a big fan of this UI, I wish I add something closer to Git's
patch interface.
---
 modules/home/jujutsu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 2eec27e..d24b5ca 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -41,6 +41,8 @@ in
         };
 
         ui = {
+          # Stop nagging me about it, though I am not a fan of its UI.
+          diff-editor = ":builtin";
           # I don't like word-diff
           diff-formatter = ":git";
           # Does not honor `$PAGER` (anymore)

From ef525a09ca72139f0a400f3fa9b1186b9a3dd842 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Nov 2025 11:13:10 +0000
Subject: [PATCH 28/29] home: jujutsu: set 'ui.merge-editor'

Same reason as `ui.diff-editor`.
---
 modules/home/jujutsu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index d24b5ca..1472e3b 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -45,6 +45,8 @@ in
           diff-editor = ":builtin";
           # I don't like word-diff
           diff-formatter = ":git";
+          # Stop nagging me about it, though I am not a fan of its UI.
+          merge-editor = ":builtin";
           # Does not honor `$PAGER` (anymore)
           pager = lib.mkDefault config.home.sessionVariables.PAGER;
         };

From af7280187ac0bd08c9b2d1fbbe41779c08b541fd Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Feb 2025 10:51:31 +0000
Subject: [PATCH 29/29] WIP: ADD NOTE FOR FUTURE SELF

---
 modules/home/jujutsu/default.nix | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 1472e3b..3072af4 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -36,8 +36,16 @@ in
 
         aliases = {
           jj = [ ];
+          # FIXME:
+          # * still not a big fan of the template
           lol = [ "log" "-r" "..@" "-T" "builtin_log_oneline" ];
           lola = [ "lol" "-r" "all()" ];
+          # FIXME: equivalent to `git switch -`
+          # See https://github.com/jj-vcs/jj/issues/2871
+          # Might be broken recently https://discord.com/channels/968932220549103686/1380272574709366989/1380432041983606855
+          # TODO:
+          # * `pick` (https://github.com/jj-vcs/jj/issues/5446): [ "util" "exec" "--" "bash" "-c" "jj log -p -r \"diff_contains($1)\"" "" ]
+          # * `root`: `jj workspace root` (barely necessary then)
         };
 
         ui = {
@@ -51,6 +59,31 @@ in
           pager = lib.mkDefault config.home.sessionVariables.PAGER;
         };
 
+        # FIXME: git equivalents
+        # I'd like a better formatted blame (more like delta's?)
+        # blame = {
+        #   coloring = "repeatedLines";
+        #   markIgnoredLines = true;
+        #   markUnblamables = true;
+        # };
+        # FIXME: log colors should probably match git
+        # FIXME: patience diff?
+        # FIXME: fetch prune/pruneTags?
+        # FIXME: pull.rebase=true? Probably true TBH
+        # FIXME: push.default=simple? Probably true TBH
+        # FIXME: conflict style? ui.conflict-marker-style=git is diff3, not zdiff3. Default looks fine-ish
+
+        # FIXME: from ma_9's config, plus my own stuff
+        # snapshot = {
+        #   auto-track = "none()";
+        # };
+        #
+        # ui = {
+        #   movement = {
+        #     edit = false;
+        #   };
+        # };
+
         templates = {
           # Equivalent to `commit.verbose = true` in Git
           draft_commit_description = "commit_description_verbose(self)";
@@ -64,6 +97,9 @@ in
               diff.git(),
             )
           '';
+          # FIXME: use `diff.summary()` instead? Supported by syntax highlighting
+          # See https://github.com/jj-vcs/jj/issues/1946#issuecomment-2572986485
+          # FIXME: tree-sitter grammar isn't in `nvim-treesitter` (https://github.com/kareigu/tree-sitter-jjdescription)
           "commit_description(commit)" = ''
             concat(
               commit.description(), "\n",