@@ -73,7 +73,6 @@ environment.localBinInPath = true;   environment.systemPackages = with pkgs; [
     htop
     lsof
-    gitMinimal
     powerdns
     sqlite-interactive
     knot-dns
@@ -976,6 +975,17 @@ enable = true;           fetcher = "channel-nixpkgs";
           channel = "nixos-unstable";
         };
+      };
+    };
+  };
+
+  programs.git = {
+    enable = true;
+    package = pkgs.gitMinimal;
+    config = {
+      advice = {
+        detachedHead = false;
+        mergeConflict = false;
       };
     };
   };