1 files changed, 8 insertions, 5 deletions

diff --git a/home.nix b/home.nix
index 2e068c4..c2377fb 100644
--- a/home.nix
+++ b/home.nix
@@ -29,14 +29,15 @@
 
   programs.git = {
     enable = true;
-    package = pkgs.gitAndTools.gitFull;
+    package = pkgs.gitFull;
     lfs.enable = true;
-    difftastic.enable = true;
 
-    userName  = "Adrian Kummerlaender";
-    userEmail = "adrian@kummerlaender.eu";
+    settings.user = {
+      name  = "Adrian Kummerlaender";
+      email = "adrian@kummerlaender.eu";
+    };
 
-    extraConfig = {
+    settings = {
       core.editor = "vim";
       merge.tool = "${pkgs.meld}/bin/meld";
       pull.ff = "only";
@@ -45,6 +46,8 @@
     };
   };
 
+  programs.difftastic.enable = true;
+
   programs.ssh = {
     enable = true;
     matchBlocks = {