mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 08:01:14 +00:00
5391882ebd
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.
46 lines
1.1 KiB
Nix
46 lines
1.1 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
|
|
{
|
|
options = {
|
|
gnu = mkOption {
|
|
type = types.bool;
|
|
default = false;
|
|
description =
|
|
'' When enabled, GNU software is chosen by default whenever a there is
|
|
a choice between GNU and non-GNU software (e.g., GNU lsh
|
|
vs. OpenSSH).
|
|
'';
|
|
};
|
|
};
|
|
|
|
config = mkIf config.gnu {
|
|
|
|
environment.systemPackages = with pkgs;
|
|
# TODO: Adjust `requiredPackages' from `system-path.nix'.
|
|
# TODO: Add Inetutils once it has the new `ifconfig'.
|
|
[ parted
|
|
#fdisk # XXX: GNU fdisk currently fails to build and it's redundant
|
|
# with the `parted' command.
|
|
nano zile
|
|
texinfo # for the stand-alone Info reader
|
|
]
|
|
++ stdenv.lib.optional (!stdenv.isArm) grub2;
|
|
|
|
|
|
# GNU GRUB, where available.
|
|
boot.loader.grub.enable = !pkgs.stdenv.isArm;
|
|
boot.loader.grub.version = 2;
|
|
|
|
# GNU lsh.
|
|
services.openssh.enable = false;
|
|
services.lshd.enable = true;
|
|
programs.ssh.startAgent = false;
|
|
|
|
# TODO: GNU dico.
|
|
# TODO: GNU Inetutils' inetd.
|
|
# TODO: GNU Pies.
|
|
};
|
|
}
|