home-manager/modules/jujutsu/default.nix

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

users/erwin/home.nix

@@ -98,13 +98,6 @@ 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;
@@ -281,7 +274,6 @@ in
             # wineWowPackages.waylandFull
             # winetricks
             wl-clipboard
-            wlvncc
             zeal
             zed-editor