diff --git a/hosts/default.nix b/hosts/default.nix
index 33f8d79..81fbf30 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -6,6 +6,7 @@ let
     ./nvim.nix
     ./nix.nix
     ./modules/zsh
+    ./modules/gnupg
     {
       _module.args = globalArgs;
     }
diff --git a/hosts/desktop-pkgs.nix b/hosts/desktop-pkgs.nix
index 1ce9b03..a5e9b7d 100644
--- a/hosts/desktop-pkgs.nix
+++ b/hosts/desktop-pkgs.nix
@@ -22,12 +22,5 @@
 
   programs = {
     git.enable = true;
-
-    gnupg = {
-      agent = {
-        enableSSHSupport = true;
-        enable = true;
-      };
-    };
   };
 }
diff --git a/hosts/minimal.nix b/hosts/minimal.nix
index 53394cf..b82d440 100644
--- a/hosts/minimal.nix
+++ b/hosts/minimal.nix
@@ -24,14 +24,6 @@
     gcc
   ];
 
-  programs = {
-    gnupg = {
-      agent = {
-        enable = true;
-      };
-    };
-  };
-
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes
diff --git a/hosts/modules/gnupg/default.nix b/hosts/modules/gnupg/default.nix
new file mode 100644
index 0000000..4ab8948
--- /dev/null
+++ b/hosts/modules/gnupg/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+  programs.gnupg = {
+    agent = {
+      enableSSHSupport = true;
+      enable = true;
+    };
+  };
+}