feat(home): Add pinentry to theme module

modules/home/options/theme/default.nix

@@ -2,6 +2,7 @@
   lib,
   namespace,
   config,
+  pkgs,
   ...
 }:
 let
@@ -9,6 +10,7 @@ let
     types
     mkOption
     literalMD
+    mkMerge
     mkIf
     mkDefault
     ;
@@ -102,21 +104,45 @@ in
       default = null;
       description = "The icon theme to use.";
     };
+
+    pinentry = mkOption {
+      type = with types; package;
+      default = pkgs.pinentry-gtk2;
+      description = "The pinentry package to use.";
+    };
   };
 
-  config = mkIf (cfg.icons != null) {
+  config = mkMerge [
-    gtk = mkIf config.gtk.enable (mkDefault {
+    # icons
-      iconTheme = {
+    (mkIf (cfg.icons != null) {
-        inherit (cfg.icons) name;
+      gtk = mkIf config.gtk.enable (mkDefault {
-        package = mkIf (cfg.icons.package != null) cfg.package;
+        iconTheme = {
-      };
+          inherit (cfg.icons) name;
-    });
+          package = mkIf (cfg.icons.package != null) cfg.package;
+        };
+      });
 
-    services.dunst = mkIf config.services.dunst.enable (mkDefault {
+      services.dunst = mkIf config.services.dunst.enable (mkDefault {
-      iconTheme = {
+        iconTheme = {
-        inherit (cfg.icons) name;
+          inherit (cfg.icons) name;
-        package = mkIf (cfg.icons.package != null) cfg.package;
+          package = mkIf (cfg.icons.package != null) cfg.package;
-      };
+        };
-    });
+      });
-  };
+    })
+
+    # pinentry
+    {
+      home.packages = [
+        cfg.pinentry
+      ];
+
+      programs.rbw = mkIf config.programs.rbw.enable (mkDefault {
+        settings.pinentry = cfg.pinentry;
+      });
+
+      services.gpg-agent = mkIf config.services.gpg-agent.enable (mkDefault {
+        pinentryPackage = cfg.pinentry;
+      });
+    }
+  ];
 }

modules/home/programs/gpg/default.nix

@@ -2,12 +2,11 @@
   lib,
   config,
   namespace,
-  pkgs,
   ...
 }:
 let
   inherit (lib) mkIf;
-  inherit (lib.${namespace}) mkEnableModule isDesktop;
+  inherit (lib.${namespace}) mkEnableModule;
 
   cfg = config.${namespace}.programs.gpg;
 in
@@ -15,12 +14,6 @@ in
   options = mkEnableModule "programs.gpg";
 
   config = mkIf cfg.enable {
-    # home-manager gpg-agent module doesn't seem to actually install the desired
-    # pinentry program, so we install it here.
-    home.packages = [
-      config.services.gpg-agent.pinentryPackage
-    ];
-
     programs.gpg = {
       enable = true;
     };
@@ -28,8 +21,6 @@ in
     services.gpg-agent = rec {
       enable = true;
 
-      pinentryPackage = if isDesktop then pkgs.pinentry-gtk2 else pkgs.pinentry-curses;
-
       # Don't ask for the password very often.
       defaultCacheTtl = 60480000;
       maxCacheTtl = defaultCacheTtl;

old/home/programs/rbw.nix

@@ -1,10 +1,8 @@
-{ pkgs, ... }:
+{ _ }:
 {
   programs.rbw = {
     enable = true;
 
     settings.email = "bitwarden@punkfairie.net";
-    # TODO: set this globally?
-    settings.pinentry = pkgs.pinentry-gtk2;
   };
 }