nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rbw: simplify 'pinentry' type

Browse source 
Following some upstream changes [1], it's now possible to use a simplified
package type for the option.

[1]: https://github.com/NixOS/nixpkgs/pull/133542
This commit is contained in:
Bruno BELANYI 2024-03-10 10:24:45 +00:00 • committed by Robert Helgesson
parent 01e4a5143e
commit 1ab3cec3a1
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
5 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/programs/rbw.nix
View file

@ -41,9 +41,9 @@ let
};
pinentry = mkOption {
type = with types; either package (enum pkgs.pinentry.flavors);
example = "gnome3";
default = "gtk2";
type = types.nullOr types.package;
example = literalExpression "pkgs.pinentry-gnome3";
default = null;
description = ''
Which pinentry interface to use. Beware that
`pinentry-gnome3` may not work on non-Gnome
@ -52,15 +52,9 @@ let
```nix
services.dbus.packages = [ pkgs.gcr ];
```
For this reason, the default is `gtk2` for
now.
'';
# we want the program in the config
apply = val:
if builtins.isString val then
"${pkgs.pinentry.${val}}/bin/pinentry"
else
"${val}/${val.binaryPath or "bin/pinentry"}";
apply = val: if val == null then val else lib.getExe val;
};
};
};
@ -87,7 +81,7 @@ in {
{
email = "name@example.com";
lock_timeout = 300;
pinentry = "gnome3";
pinentry = pkgs.pinentry-gnome3;
}
'';
description = ''