home: Enable jujutsu

home-manager/modules/jujutsu/default.nix

@@ -40,6 +40,8 @@ in
   config = mkIf cfg.enable {
     programs.jujutsu = {
       enable = true;
+      ediff = false;
+
       settings = {
         user = {
           name = cfg.name;
@@ -58,18 +60,19 @@ in
           pager = lib.getExe pkgs.bat;
         };
 
-        diff.difftastic = {
-          program = lib.getExe pkgs.difftastic;
-          diff-args = [
-            "--color=auto"
-            "--background=dark"
-            "--display=side-by-side-show-both"
-            "$left"
-            "$right"
-          ];
+        merge-tools = {
+          difftastic = {
+            program = lib.getExe pkgs.difftastic;
+            diff-args = [
+              "--color=always"
+              "--background=dark"
+              "--display=side-by-side-show-both"
+              "$left"
+              "$right"
+            ];
 
+          };
         };
-
         signing = {
           sign-all = true;
           backend = cfg.signingBackend;

users/erwin/home.nix

@@ -98,6 +98,13 @@ in
             };
           };
           gpg.enable = true;
+          jujutsu = {
+            enable = true;
+            name = "Erwin Boskma";
+            email = "erwin@datarift.nl";
+            signingKey = "~/.ssh/id_ed25519_sk_personal.pub";
+            signingBackend = "ssh";
+          };
           mpd.enable = true;
           neovim.enable = true;
           nnn.enable = true;
@@ -274,6 +281,7 @@ in
             # wineWowPackages.waylandFull
             # winetricks
             wl-clipboard
+            wlvncc
             zeal
             zed-editor