diff options
| author | Peter Simons <simons@cryp.to> | 2016-03-18 10:31:40 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-03-18 11:06:31 +0100 |
| commit | 5391882ebd781149e213e8817fba6ac3c503740c (patch) | |
| tree | aa861d183a61b1fd68dc164b9520d020b25ad093 /nixos/modules/services/x11/display-managers | |
| parent | 9c10ac957dd77e22e9c4f29cd54652d9547c624a (diff) | |
| download | nixlib-5391882ebd781149e213e8817fba6ac3c503740c.tar nixlib-5391882ebd781149e213e8817fba6ac3c503740c.tar.gz nixlib-5391882ebd781149e213e8817fba6ac3c503740c.tar.bz2 nixlib-5391882ebd781149e213e8817fba6ac3c503740c.tar.lz nixlib-5391882ebd781149e213e8817fba6ac3c503740c.tar.xz nixlib-5391882ebd781149e213e8817fba6ac3c503740c.tar.zst nixlib-5391882ebd781149e213e8817fba6ac3c503740c.zip | |
services.xserver.startGnuPGAgent: remove obsolete NixOS option
GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no
longer requires (or even supports) the "start everything as a child of the
agent" scheme we've implemented in NixOS for older versions.
To configure the gpg-agent for your X session, add the following code to
~/.xsession or some other appropriate place that's sourced at start-up:
gpg-connect-agent /bye
GPG_TTY=$(tty)
export GPG_TTY
If you want to use gpg-agent for SSH, too, also add the settings
unset SSH_AGENT_PID
export SSH_AUTH_SOCK="${HOME}/.gnupg/S.gpg-agent.ssh"
and make sure that
enable-ssh-support
is included in your ~/.gnupg/gpg-agent.conf.
The gpg-agent(1) man page has more details about this subject, i.e. in the
"EXAMPLES" section.
Diffstat (limited to 'nixos/modules/services/x11/display-managers')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 533b03aff08d..7dffdfc2b36c 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -49,17 +49,6 @@ let fi ''} - ${optionalString cfg.startGnuPGAgent '' - if test -z "$SSH_AUTH_SOCK"; then - # Restart this script as a child of the GnuPG agent. - exec "${pkgs.gnupg}/bin/gpg-agent" \ - --enable-ssh-support --daemon \ - --pinentry-program "${pkgs.pinentry}/bin/pinentry-gtk-2" \ - --write-env-file "$HOME/.gpg-agent-info" \ - "$0" "$sessionType" - fi - ''} - # Handle being called by kdm. if test "''${1:0:1}" = /; then eval exec "$1"; fi |