all repos — nixfiles @ 6c1a3d2a6e370b956d2397a5302058bed3a0cf71

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

extract git client configuration

Alin
commit

6c1a3d2a6e370b956d2397a5302058bed3a0cf71

parent

5f689657009cc14f916f967075c28596673e2ac4

1 file changed, 23 insertions(+), 10 deletions(-)

changed files
M system/settings/programs/base.nix → system/settings/programs/base.nix
@@ -17,15 +17,28 @@ ++ (lib.optionals (stdenv.isLinux) [
       psmisc
     ]);
 
-  programs = lib.optionalAttrs (options.programs ? htop) {
-    htop = {
-      enable = true;
-      settings = {
-        header_margin = 0;
-        tree_view = true;
-        hide_userland_threads = true;
-        hide_kernel_threads = true;
+  programs =
+    { }
+    // (lib.optionalAttrs (options.programs ? git) {
+      git = {
+        enable = true;
+        config = {
+          advice = {
+            detachedHead = false;
+            mergeConflict = false;
+          };
+        };
+      };
+    })
+    // (lib.optionalAttrs (options.programs ? htop) {
+      htop = {
+        enable = true;
+        settings = {
+          header_margin = 0;
+          tree_view = true;
+          hide_userland_threads = true;
+          hide_kernel_threads = true;
+        };
       };
-    };
-  };
+    });
 }