diff --git a/hosts/desktop/home-manager/default.nix b/hosts/desktop/home-manager/default.nix
index 8a70580..e5f8e5a 100644
--- a/hosts/desktop/home-manager/default.nix
+++ b/hosts/desktop/home-manager/default.nix
@@ -9,6 +9,4 @@
     ./hyprpaper.nix
     ./settings.nix
   ];
-
-  programs.git.signing.key = "706F53DD087A91DE";
 }
diff --git a/hosts/nidaros/home-manager/default.nix b/hosts/nidaros/home-manager/default.nix
index c70418f..f8eafb5 100644
--- a/hosts/nidaros/home-manager/default.nix
+++ b/hosts/nidaros/home-manager/default.nix
@@ -4,6 +4,4 @@
   imports = with lib.custom; [
     (relativeToBase "home-manager")
   ];
-
-  programs.git.signing.key = "4E323F914029E976";
 }
diff --git a/hosts/pi4/home-manager/default.nix b/hosts/pi4/home-manager/default.nix
index 6975653..f8eafb5 100644
--- a/hosts/pi4/home-manager/default.nix
+++ b/hosts/pi4/home-manager/default.nix
@@ -4,6 +4,4 @@
   imports = with lib.custom; [
     (relativeToBase "home-manager")
   ];
-
-  programs.git.signing.key = "E3FA0E995C0D0E5E";
 }
diff --git a/hosts/thinkpad/home-manager/default.nix b/hosts/thinkpad/home-manager/default.nix
index 6ba4253..02d109c 100644
--- a/hosts/thinkpad/home-manager/default.nix
+++ b/hosts/thinkpad/home-manager/default.nix
@@ -9,6 +9,4 @@
     ./hyprland
     ./zen
   ];
-
-  programs.git.signing.key = "848D71DE0590C199";
 }
diff --git a/shared/base/home-manager/development/git.nix b/shared/base/home-manager/development/git.nix
index bca0321..c1e6673 100644
--- a/shared/base/home-manager/development/git.nix
+++ b/shared/base/home-manager/development/git.nix
@@ -1,4 +1,9 @@
-{ pkgs, common, ... }:
+{
+  pkgs,
+  common,
+  systemConfig,
+  ...
+}:
 
 {
   home.packages = with pkgs; [
@@ -23,7 +28,10 @@
         p = "push";
       };
 
-      signing.signByDefault = true;
+      signing = {
+        signByDefault = true;
+        key = systemConfig.git.signing.key;
+      };
 
       extraConfig = {
         init.defaultBranch = "main";