1 files changed, 5 insertions, 2 deletions
diff --git a/home.nix b/home.nix
index 6b5304c..230ae37 100644
--- a/home.nix
+++ b/home.nix
@@ -37,8 +37,11 @@ in {
     userName  = "Adrian Kummerlaender";
     userEmail = "adrian@kummerlaender.eu";
 
-    extraConfig.core.editor = "vim";
-    extraConfig.merge.tool = "${pkgs.meld}/bin/meld";
+    extraConfig = {
+      core.editor = "vim";
+      merge.tool = "${pkgs.meld}/bin/meld";
+      pull.ff = "only";
+    };
   };
 
   programs.ssh = {