diff --git a/configuration.nix b/configuration.nix
index f1b2804..1e7a3db 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -106,6 +106,8 @@ in
     xkbVariant = "dvp,";
     xkbOptions = "compose:menu, grp:alt_shift_toggle, lv3:ralt_switch";
 
+    exportConfiguration = true;
+
     windowManager = {
       xmonad = {
         enable = true;
diff --git a/home.nix b/home.nix
index 82439fb..c4d7c62 100644
--- a/home.nix
+++ b/home.nix
@@ -29,6 +29,7 @@
             typst
             uiua386
             uiua
+            byzanz
         ];
 
 # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -336,7 +337,10 @@
 
             hardtime.enable = true;
 
-            diffview.enable = true;
+            diffview = {
+                enable = true;
+                view.mergeTool.layout = "diff3_mixed";
+            };
         };
         extraConfigLua = ''
             luasnip = require("luasnip")