diff --git a/home.nix b/home.nix
index ae192aa..5181227 100644
--- a/home.nix
+++ b/home.nix
@@ -123,21 +123,33 @@ in {
 
   programs.jujutsu = {
     enable = true;
+    ediff = true;
     settings = {
       user = {
         email = "khais.colin@gmail.com";
         name = "Khaïs COLIN";
       };
+      signing = {
+        sign-all = true;
+        backend = "ssh";
+        key = "/home/khais/.ssh/id_ed25519.pub";
+      };
       ui = {
-        editor = "emacsclient";
+        editor = "emacsclient -a ''";
         default-command = "log";
         movement.edit = true;
         # do not page if output fits on one screen
         pager = "less -FRX";
       };
-      merge-tools.ediff = {
-        program = "sh";
-        merge-args = ["-c" "emacsclient -c --eval (ediff-merge-files-with-anscestor \"$0\" \"$1\" \"$2\" nil \"$3\")" "$left" "$right" "$base" "$output"];
+      fix.tools = {
+        clang-format = {
+          command = ["${pkgs.clang-tools}/bin/clang-format" "--assume-filename=$path"];
+          patterns = ["glob:'**/*.cpp'" "glob:'**/*.hpp'"];
+        };
+        whitespace = {
+          command = ["${pkgs.perl}/bin/perl" "-p" "-e" "s/ +$//" "$path"];
+          patterns = ["glob:'**/*'"];
+        };
       };
     };
   };
diff --git a/wm/river.nix b/wm/river.nix
index eb0bc65..72294a8 100644
--- a/wm/river.nix
+++ b/wm/river.nix
@@ -165,10 +165,12 @@ in {
           "None Scroll_Lock" = "spawn 'playerctl previous'";
           "None XF86AudioNext" = "spawn 'playerctl next'";
           "None Pause" = "spawn 'cmus-remote -C player-next-album'";
+
           "None XF86Bluetooth" = "spawn 'playerctl play-pause'";
           "None XF86Tools" = "spawn 'playerctl previous'";
           "None XF86Keyboard" = "spawn 'playerctl next'";
           "None XF86Favorites" = "spawn 'cmus-remote -C player-next-album'";
+
           "None XF86AudioMute" = "spawn 'wpctl set-mute @DEFAULT_SINK@ toggle'";
         };
       };