summary refs log tree commit diff
path: root/nixos/modules/programs
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2018-10-27 16:03:13 +0200
committerworldofpeace <worldofpeace@protonmail.ch>2019-10-16 19:56:50 -0400
commitb5bea4ce32a26deb3b6d600893e37a4c347c66ab (patch)
treef52d8c3acac829d397afa3aba76f0120f6e10134 /nixos/modules/programs
parentedea9fed725339a42f94f42139b8f9d2af0de5ee (diff)
downloadnixpkgs-b5bea4ce32a26deb3b6d600893e37a4c347c66ab.tar
nixpkgs-b5bea4ce32a26deb3b6d600893e37a4c347c66ab.tar.gz
nixpkgs-b5bea4ce32a26deb3b6d600893e37a4c347c66ab.tar.bz2
nixpkgs-b5bea4ce32a26deb3b6d600893e37a4c347c66ab.tar.lz
nixpkgs-b5bea4ce32a26deb3b6d600893e37a4c347c66ab.tar.xz
nixpkgs-b5bea4ce32a26deb3b6d600893e37a4c347c66ab.tar.zst
nixpkgs-b5bea4ce32a26deb3b6d600893e37a4c347c66ab.zip
gnupg: disable gui/pinentry support by default
This solves the dependency cycle in gcr alternatively so there won't be
two gnupg store paths in a standard NixOS system which has udisks2 enabled
by default.

NixOS users are expected to use the gpg-agent user service to pull in the
appropriate pinentry flavour or install it on their systemPackages and set
it in their local gnupg agent config instead.

Co-authored-by: Florian Klink <flokli@flokli.de>
Diffstat (limited to 'nixos/modules/programs')
-rw-r--r--nixos/modules/programs/gnupg.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
index dd3d74c2632..4fb7c43c8b2 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -76,7 +76,7 @@ in
         thus overrides the pinentry option in gpg-agent.conf in the user's
         home directory.
         If not set at all, it'll pick an appropriate flavor depending on the
-        system configuration (qt3 flavor for lxqt and plasma5, gtk2 for xfce
+        system configuration (qt flavor for lxqt and plasma5, gtk2 for xfce
         4.12, gnome3 on all other systems with X enabled, ncurses otherwise).
       '';
     };