1 files changed, 2 insertions, 0 deletions

diff --git a/home.nix b/home.nix
index 15ce0ae..e4cf7ca 100644
--- a/home.nix
+++ b/home.nix
@@ -23,7 +23,9 @@
 
     userName  = "Adrian Kummerlaender";
     userEmail = "adrian@kummerlaender.eu";
+
     extraConfig.core.editor = "vim";
+    extraConfig.merge.tool = "${pkgs.meld}/bin/meld";
   };
 
   programs.ssh = {