diff --git a/configurations/git.nix b/configurations/git.nix
index 9cc4add1..e88d5703 100644
--- a/configurations/git.nix
+++ b/configurations/git.nix
@@ -6,7 +6,7 @@
     default = "charlotte@vanpetegem.me";
     example = "charlotte@vanpetegem.me";
     description = ''
-      Default email set in git config
+      Default email set in global git config.
     '';
   };
 
diff --git a/configurations/gnupg.nix b/configurations/gnupg.nix
index f933287c..7f041e08 100644
--- a/configurations/gnupg.nix
+++ b/configurations/gnupg.nix
@@ -1,14 +1,23 @@
-{ ... }:
+{ config, lib, ... }:
 
 {
-  custom.zfs.homeLinks = [
+  options.custom.gnupg.pinentryFlavor = lib.mkOption {
+    type = lib.types.str;
+    default = "curses";
+    example = "qt";
+    description = ''
+      Pinentry flavor for gnupg.
+    '';
+  };
+
+  config.custom.zfs.homeLinks = [
     { path = ".gnupg/crls.d"; type = "data"; }
     { path = ".gnupg/private-keys-v1.d"; type = "data"; }
     { path = ".gnupg/pubring.kbx"; type = "data"; }
     { path = ".gnupg/trustdb.gpg"; type = "data"; }
   ];
-  programs.gnupg.agent.enable = true;
-  home-manager.users.charlotte = { pkgs, ... }: {
+  config.programs.gnupg.agent.enable = true;
+  config.home-manager.users.charlotte = { pkgs, ... }: {
     programs = {
       gpg.enable = true;
     };
@@ -16,7 +25,7 @@
       enable = true;
       defaultCacheTtl = 7200;
       maxCacheTtl = 99999;
-      pinentryFlavor = "qt";
+      pinentryFlavor = config.custom.gnupg.pinentryFlavor;
     };
   };
 }
diff --git a/profiles/common.nix b/profiles/common.nix
index 7a289ea3..c22a46c9 100644
--- a/profiles/common.nix
+++ b/profiles/common.nix
@@ -7,6 +7,7 @@
     ../overlays/default.nix
     ../configurations/direnv.nix
     ../configurations/git.nix
+    ../configurations/gnupg.nix
     ../configurations/locale.nix
     ../configurations/neovim.nix
     ../configurations/nix-index.nix
@@ -28,5 +29,4 @@
       youtube-dl
     ];
   };
-
 }
diff --git a/profiles/graphical.nix b/profiles/graphical.nix
index dbbc1a0d..52372e41 100644
--- a/profiles/graphical.nix
+++ b/profiles/graphical.nix
@@ -8,7 +8,6 @@
     ../configurations/dropbox.nix
     ../configurations/firefox.nix
     ../configurations/fonts.nix
-    ../configurations/gnupg.nix
     ../configurations/i3.nix
     ../configurations/joplin.nix
     ../configurations/kernel.nix
@@ -52,4 +51,6 @@
       fi
     '';
   };
+
+  custom.gnupg.pinentryFlavor = "qt";
 }