From 918ab024b67faa112d6a7fe9f0e09e6ac73e1892 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 22 Jun 2024 18:09:11 +0200
Subject: linde: add minimal git configuration

---
 system/linde.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'system/linde.nix')

diff --git a/system/linde.nix b/system/linde.nix
index 48f8b8fe..ce7e073e 100644
--- a/system/linde.nix
+++ b/system/linde.nix
@@ -73,7 +73,6 @@ in
   environment.systemPackages = with pkgs; [
     htop
     lsof
-    gitMinimal
     powerdns
     sqlite-interactive
     knot-dns
@@ -980,6 +979,17 @@ in
     };
   };
 
+  programs.git = {
+    enable = true;
+    package = pkgs.gitMinimal;
+    config = {
+      advice = {
+        detachedHead = false;
+        mergeConflict = false;
+      };
+    };
+  };
+
   services.laminar = {
     enable = true;
     path = with pkgs; [
-- 
cgit 1.4.1