diff --git a/home/default.nix b/home/default.nix
index e218ece7..95713608 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -7,7 +7,6 @@
 }: {
   imports = [
     ./programs
-    ./services.nix
   ];
 
   age.identityPaths = [
diff --git a/home/services.nix b/home/services.nix
deleted file mode 100644
index ee852b3f..00000000
--- a/home/services.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  services.gpg-agent = {
-    enable = true;
-    enableZshIntegration = true;
-    defaultCacheTtl = 86400;
-    maxCacheTtl = 86400;
-    pinentry.package = with pkgs;
-      if stdenv.isDarwin
-      then pinentry_mac
-      else pinentry-tty;
-  };
-}
diff --git a/hosts/Rhizome/home.nix b/hosts/Rhizome/home.nix
new file mode 100644
index 00000000..803a42a7
--- /dev/null
+++ b/hosts/Rhizome/home.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  rc.gpg.enable = true;
+}
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 318cf79b..facce5db 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -4,6 +4,7 @@
     ./programs
     ./development.nix
     ./editor.nix
+    ./gpg.nix
     ./scm.nix
     ./ssh.nix
     ./utilities.nix
diff --git a/modules/home/gpg.nix b/modules/home/gpg.nix
new file mode 100644
index 00000000..b0fe1642
--- /dev/null
+++ b/modules/home/gpg.nix
@@ -0,0 +1,44 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib) mkIf;
+
+  cfg = config.rc.gpg;
+in {
+  options = {
+    rc.gpg = {
+      enable = lib.mkEnableOption "GPG-based identity configuration";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    programs.gpg = {
+      enable = true;
+      settings = {
+        default-key = "413D1A0152BCB08D2E3DDACAF88C08579051AB48";
+      };
+    };
+
+    programs.git.signing = {
+      key = "F88C08579051AB48";
+      signByDefault = true;
+    };
+
+    services.gpg-agent = {
+      enable = true;
+      enableScDaemon = true;
+      enableSshSupport = true;
+      enableZshIntegration = true;
+      defaultCacheTtlSsh = 600;
+      maxCacheTtlSsh = 3600;
+      noAllowExternalCache = true;
+      pinentry.package = with pkgs;
+        if stdenv.isDarwin
+        then pinentry_mac
+        else pinentry-tty;
+    };
+  };
+}
diff --git a/modules/home/scm.nix b/modules/home/scm.nix
index a1f8b451..24af2317 100644
--- a/modules/home/scm.nix
+++ b/modules/home/scm.nix
@@ -51,10 +51,6 @@ in {
 
       programs.git = {
         enable = true;
-        signing = {
-          key = "F88C08579051AB48";
-          signByDefault = true;
-        };
         settings = {
           user = {
             name = "✿ corey";
@@ -72,13 +68,6 @@ in {
         enable = true;
         enableGitIntegration = true;
       };
-
-      programs.gpg = {
-        enable = true;
-        settings = {
-          default-key = "413D1A0152BCB08D2E3DDACAF88C08579051AB48";
-        };
-      };
     })
 
     (mkIf gitCfg.enableHubWrapper {