2 files changed, 11 insertions, 0 deletions
diff --git a/modules/security/gpg/default.nix b/modules/security/gpg/default.nix
index cd77549..88c57d1 100644
--- a/modules/security/gpg/default.nix
+++ b/modules/security/gpg/default.nix
@@ -21,6 +21,11 @@
   config = lib.mkIf config.security.gpg.enable {
     programs.gpg = {
       enable = true;
+      homedir = "${config.xdg.dataHome}/gnupg";
+    };
+
+    home.sessionVariables = {
+      GNUPGHOME = config.programs.gpg.homedir;
     };
 
     services.gpg-agent = {
diff --git a/modules/security/ssh/default.nix b/modules/security/ssh/default.nix
index c616677..9b89deb 100644
--- a/modules/security/ssh/default.nix
+++ b/modules/security/ssh/default.nix
@@ -16,6 +16,12 @@
       default = config.programs.ssh.package;
       description = "The ssh package to use.";
     };
+
+    extraGopassKeys = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = [ ];
+      description = "Additional SSH keys to load from the gopass store (entries under ssh/), in addition to the git platform keys.";
+    };
   };
 
   config = lib.mkIf config.security.ssh.enable {