From c2aa932494fbab644471b96089b88bcc3113b5df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?m=C3=BCde?= <git@darkest.space>
Date: Fri, 1 May 2026 23:43:24 +0200
Subject: [PATCH] move git to own mod

---
 homeModules/git.nix             |  6 ------
 nixosConfigurations.nix         | 10 +++++++---
 nixosModules/default.nix        |  1 +
 nixosModules/git.nix            | 24 ++++++++++++++++++++++++
 nixosModules/globalinstalls.nix |  8 --------
 5 files changed, 32 insertions(+), 17 deletions(-)
 delete mode 100644 homeModules/git.nix
 create mode 100644 nixosModules/git.nix

diff --git a/homeModules/git.nix b/homeModules/git.nix
deleted file mode 100644
index 2c66c82..0000000
--- a/homeModules/git.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    settings.init.defaultBranch = "main";
-  };
-}
diff --git a/nixosConfigurations.nix b/nixosConfigurations.nix
index 9874985..9fb2cf2 100644
--- a/nixosConfigurations.nix
+++ b/nixosConfigurations.nix
@@ -65,17 +65,20 @@ forDevice (
         };
 
         my = {
+          # keep-sorted start
           autoupdate.enable = true;
           distributedBuilds.enable = true;
-          overlays.unstable.enable = true;
-          overlays.vscodeExtensions.enable = true;
           extraCaches.enable = true;
+          git.enable = true;
           globalinstalls.enable = true;
           lixIsNix.enable = true;
           openssh.enable = true;
+          overlays.unstable.enable = true;
+          overlays.vscodeExtensions.enable = true;
           # prometheusNode.enable = true;
           systemdBoot.enable = true;
           tailscale.enable = true;
+          # keep-sorted end
         };
       }
     ]
@@ -90,7 +93,6 @@ forDevice (
           sharedModules = [
             { home.stateVersion = "22.11"; }
             # keep-sorted start
-            self.homeModules.git
             self.homeModules.gnome-extensions
             self.homeModules.nano
             self.homeModules.templates
@@ -108,6 +110,7 @@ forDevice (
         };
 
         my = {
+          # keep-sorted start
           enDe.enable = true;
           firmwareUpdates.enable = true;
           gnome.enable = true;
@@ -116,6 +119,7 @@ forDevice (
           nixLd.enable = true;
           quietBoot.enable = true;
           stylix.enable = true;
+          # keep-sorted end
         };
       }
     ];
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index 46dbbd7..2808b2a 100644
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -9,6 +9,7 @@
     ./en-de.nix
     ./extra-caches.nix
     ./firmware-updates.nix
+    ./git.nix
     ./globalinstalls.nix
     ./gnome.nix
     ./intel-graphics.nix
diff --git a/nixosModules/git.nix b/nixosModules/git.nix
new file mode 100644
index 0000000..ffe5c78
--- /dev/null
+++ b/nixosModules/git.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+{
+  options.my.git.enable = lib.mkEnableOption "git with credential helper";
+
+  config = lib.mkIf config.my.git.enable {
+    environment.systemPackages = [ pkgs.git-credential-oauth ];
+
+    programs.git = {
+      enable = true;
+      config = {
+        init.defaultBranch = "main";
+        credential = {
+          helper = "oauth";
+          credentialStore = "cache";
+        };
+      };
+    };
+  };
+}
diff --git a/nixosModules/globalinstalls.nix b/nixosModules/globalinstalls.nix
index 56061ee..6c914c7 100644
--- a/nixosModules/globalinstalls.nix
+++ b/nixosModules/globalinstalls.nix
@@ -16,24 +16,16 @@
       screen
       tldr
       nix-output-monitor
-      git-credential-oauth
     ];
 
     programs = {
       zsh.enable = true;
       htop.enable = true;
       iotop.enable = true;
-      git.enable = true;
       nano = {
         enable = true;
         syntaxHighlight = true;
       };
     };
-
-    environment.etc."gitconfig".text = ''
-      [credential]
-        helper = oauth
-        credentialStore = cache
-    '';
   };
 }