diff --git a/nixos/common/services/gnupg-agent.nix b/nixos/common/services/gnupg-agent.nix
new file mode 100644
index 00000000..68fcbb6a
--- /dev/null
+++ b/nixos/common/services/gnupg-agent.nix
@@ -0,0 +1,8 @@
+{pkgs, cfg, ... }: {
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+    enableBrowserSocket = true;
+    pinEntryFlavor = "emacs";
+  };
+}
\ No newline at end of file
diff --git a/nixos/common/services/openssh.nix b/nixos/common/services/openssh.nix
index baf97dd5..8455e856 100644
--- a/nixos/common/services/openssh.nix
+++ b/nixos/common/services/openssh.nix
@@ -49,7 +49,4 @@
     --
     '';
   };
-
-  # Enable GPG Agent support:
-  programs.gnupg.agent.enableSSHSupport = true;
 }
\ No newline at end of file
diff --git a/nixos/default.nix b/nixos/default.nix
index e69dd62c..f0a5b228 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -7,6 +7,7 @@
       ./common/services/telegraf.nix
       ./common/services/tailscale.nix
       ./common/services/fwupd.nix
+      ./common/services/gnupg-agent.nix
 
       # NixOS Modules
       ./common/modules/fonts.nix       # Font Configs