From 7c83ca07decc57870adcfc5b741f426bf6936de8 Mon Sep 17 00:00:00 2001
From: Weckyy702 <konstantin@veltko.de>
Date: Tue, 23 Jun 2026 14:16:22 +0200
Subject: [PATCH] Git: Split git home-manager config into user-specific and
 machine-user specific parts

---
 modules/hosts/tux/users/weckyy702/git.nix     |  5 +++++
 .../hosts/tux/users/weckyy702/weckyy702.nix   |  2 ++
 modules/programs/git.nix                      | 17 -----------------
 modules/users/weckyy702/git.nix               | 19 +++++++++++++++++++
 modules/users/weckyy702/weckyy702.nix         |  2 ++
 5 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 modules/hosts/tux/users/weckyy702/git.nix
 create mode 100644 modules/users/weckyy702/git.nix

diff --git a/modules/hosts/tux/users/weckyy702/git.nix b/modules/hosts/tux/users/weckyy702/git.nix
new file mode 100644
index 0000000..6ec063a
--- /dev/null
+++ b/modules/hosts/tux/users/weckyy702/git.nix
@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.tux-weckyy702-git = {
+    programs.git.signing.key = "/home/weckyy702/.ssh/id_ed25519_github_sign";
+  };
+}
diff --git a/modules/hosts/tux/users/weckyy702/weckyy702.nix b/modules/hosts/tux/users/weckyy702/weckyy702.nix
index b4a68f2..66585bd 100644
--- a/modules/hosts/tux/users/weckyy702/weckyy702.nix
+++ b/modules/hosts/tux/users/weckyy702/weckyy702.nix
@@ -18,6 +18,8 @@
           blueman-applet
           prusa-slicer
           backlight
+
+          tux-weckyy702-git
         ];
     };
   };
diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index e2f2aff..573747c 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -2,21 +2,4 @@
   flake.modules.nixos.git = { pkgs, ... }: {
     environment.systemPackages = [ pkgs.git ];
   };
-
-  flake.modules.homeManager.git = {
-    programs.git = {
-      enable = true;
-      settings = {
-        user = {
-          email = "konstantin@veltko.de";
-          name = "Weckyy702";
-        };
-        init.defaultBranch = "main";
-      };
-      signing = {
-        format = "ssh";
-        signByDefault = true;
-      };
-    };
-  };
 }
diff --git a/modules/users/weckyy702/git.nix b/modules/users/weckyy702/git.nix
new file mode 100644
index 0000000..f563052
--- /dev/null
+++ b/modules/users/weckyy702/git.nix
@@ -0,0 +1,19 @@
+{
+  flake.modules.homeManager.weckyy702-git = {
+    programs.git = {
+      enable = true;
+      settings = {
+        user = {
+          email = "konstantin@veltko.de";
+          name = "Weckyy702";
+        };
+        init.defaultBranch = "main";
+      };
+      signing = {
+        # NOTE: The signing key needs to be set per machine, see hosts/<name>/users/weckyy702/git.nix
+        format = "ssh";
+        signByDefault = true;
+      };
+    };
+  };
+}
diff --git a/modules/users/weckyy702/weckyy702.nix b/modules/users/weckyy702/weckyy702.nix
index e8ace79..a99d246 100644
--- a/modules/users/weckyy702/weckyy702.nix
+++ b/modules/users/weckyy702/weckyy702.nix
@@ -21,6 +21,8 @@
         imports = with self.modules.homeManager; [
           nixvim
           btop
+
+          weckyy702-git
           #TODO: moar aspects
         ];
       };