From 5b0649f18ad2b63614f527a9002c1db621afd370 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 27 Apr 2019 21:22:44 +0200
Subject: Set meld as git merge tool

---
 gui/apps/dev.nix | 4 +++-
 home.nix         | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gui/apps/dev.nix b/gui/apps/dev.nix
index 4f3bf2e..9b2c044 100644
--- a/gui/apps/dev.nix
+++ b/gui/apps/dev.nix
@@ -7,8 +7,10 @@
       zeal
       hotspot
       qcachegrind
-      gitg
       paraview
+    # version control
+      gitg
+      meld
     # language utilities
       artha
     ];
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 = {
-- 
cgit v1.2.3