all repos — nixfiles @ 918ab024b67faa112d6a7fe9f0e09e6ac73e1892

System and user configuration, managed by nix and home-manager

linde: add minimal git configuration

Alan Pearce
commit

918ab024b67faa112d6a7fe9f0e09e6ac73e1892

parent

51ee47682f841acadc3fa260af4e09b11de0daff

1 file changed, 11 insertions(+), 1 deletion(-)

jump to
M system/linde.nix → system/linde.nix
@@ -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;
       };
     };
   };