all repos — nixfiles @ 6c1a3d2a6e370b956d2397a5302058bed3a0cf71

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

extract git client configuration

Alin
commit

6c1a3d2a6e370b956d2397a5302058bed3a0cf71

parent

5f689657009cc14f916f967075c28596673e2ac4

3 files changed, 23 insertions(+), 29 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -775,16 +775,6 @@ overrideDevices = false;
     overrideFolders = false;
   };
 
-  programs.git = {
-    enable = true;
-    config = {
-      advice = {
-        detachedHead = false;
-        mergeConflict = false;
-      };
-    };
-  };
-
   services.ntfy-sh = {
     enable = true;
     settings = {
M system/hosts/smrk.nix → system/hosts/smrk.nix
@@ -82,15 +82,6 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIy9jFioBvV0JA0lc+De2N+vDOABGHgCECW6vkD33CE4 sourcehut"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIII7sWEwsm8JZiJ0LUnjSt0Kg1RXypG6p5AzP/R2n5ca actions@github.com"
     ];
   };
-  programs.git = {
-    enable = true;
-    config = {
-      advice = {
-        detachedHead = false;
-        mergeConflict = false;
-      };
-    };
-  };
 
   services.syncthing = {
     enable = true;
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;
+        };
       };
-    };
-  };
+    });
 }