3 files changed, 24 insertions, 0 deletions
diff --git a/modules/programs/git/default.nix b/modules/programs/git/default.nix
index 305112f..2c4303b 100644
--- a/modules/programs/git/default.nix
+++ b/modules/programs/git/default.nix
@@ -22,6 +22,11 @@
 
   config = lib.mkIf config.programs.git.enable {
     programs.git = {
+      includes = [
+        # An additional config file for global git settings but for more
+        # private/non-portable configuration options like GPG keys
+        { path = "${config.xdg.configHome}/git/personal"; }
+      ];
       settings =
         lib.recursiveUpdate
           {
diff --git a/modules/programs/gpg/default.nix b/modules/programs/gpg/default.nix
index 9e2da2c..c2183c7 100644
--- a/modules/programs/gpg/default.nix
+++ b/modules/programs/gpg/default.nix
@@ -7,6 +7,7 @@
 }:
 
 {
+  imports = [ ./git.nix ];
   config = lib.mkIf config.programs.gpg.enable {
     services.gpg-agent = {
       enable = true;
diff --git a/modules/programs/gpg/git.nix b/modules/programs/gpg/git.nix
new file mode 100644
index 0000000..a4a74d2
--- /dev/null
+++ b/modules/programs/gpg/git.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+
+{
+  options.programs.git.signCommits = lib.mkEnableOption "GPG signing of git commits.";
+
+  config = lib.mkIf config.programs.git.signCommits {
+    assertions = [
+      {
+        assertion = config.programs.gpg.enable;
+        message = "programs.git.signCommits requires programs.gpg.enable to be true.";
+      }
+    ];
+
+    programs.git.settings = {
+      commit.gpgSign = true;
+    };
+  };
+}