diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix
index b1325bb..decb18e 100644
--- a/users/infinidoge/default.nix
+++ b/users/infinidoge/default.nix
@@ -61,8 +61,6 @@
       ffmpeg
       ntfs3g
       unzip
-
-      gnupg
     ];
 
     shellAliases = {
@@ -77,12 +75,6 @@
     dconf.enable = true;
 
     steam.enable = true;
-
-    gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-      pinentryFlavor = "gnome3"; # "emacs" potential
-    };
   };
 
   fonts = {
diff --git a/users/profiles/gpg.nix b/users/profiles/gpg.nix
new file mode 100644
index 0000000..e752159
--- /dev/null
+++ b/users/profiles/gpg.nix
@@ -0,0 +1,12 @@
+{ config, ... }: {
+  programs.gpg = {
+    enable = true;
+    homedir = "${config.xdg.dataHome}/gnupg";
+  };
+
+  services.gpg-agent = {
+    enable = true;
+    enableSshSupport = true;
+    pinentryFlavor = "gnome3";
+  };
+}