eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-25 03:09:47 +01:00
Code Issues Releases Wiki Activity

gpg-agent: add nushell integration

Browse source
This commit is contained in:
TornaxO7 2023-11-25 16:56:07 +01:00 committed by Robert Helgesson
parent de9134144b
commit a2523ea034
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/services/gpg-agent.nix
View file

@ -22,6 +22,16 @@ let
set -gx GPG_TTY (tty) set -gx GPG_TTY (tty)
'' + optionalString cfg.enableSshSupport gpgSshSupportStr; '' + optionalString cfg.enableSshSupport gpgSshSupportStr;
gpgNushellInitStr = ''
$env.GPG_TTY = (tty)
'' + optionalString cfg.enableSshSupport ''
${gpgPkg}/bin/gpg-connect-agent updatestartuptty /bye | ignore
if not "SSH_AUTH_SOCK" in $env {
$env.SSH_AUTH_SOCK = (${gpgPkg}/bin/gpgconf --list-dirs agent-ssh-socket)
}
'';
# mimic `gpgconf` output for use in `systemd` unit definitions. # mimic `gpgconf` output for use in `systemd` unit definitions.
# we cannot use `gpgconf` directly because it heavily depends on system # we cannot use `gpgconf` directly because it heavily depends on system
# state, but we need the values at build time. original: # state, but we need the values at build time. original:
@ -216,6 +226,10 @@ in {
enableFishIntegration = mkEnableOption "Fish integration" // { enableFishIntegration = mkEnableOption "Fish integration" // {
default = true; default = true;
}; };
enableNushellIntegration = mkEnableOption "Nushell integration" // {
default = true;
};
}; };
}; };
@ -247,6 +261,9 @@ in {
programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgInitStr; programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgInitStr;
programs.fish.interactiveShellInit = programs.fish.interactiveShellInit =
mkIf cfg.enableFishIntegration gpgFishInitStr; mkIf cfg.enableFishIntegration gpgFishInitStr;
programs.nushell.extraEnv =
mkIf cfg.enableNushellIntegration gpgNushellInitStr;
} }
(mkIf (cfg.sshKeys != null) { (mkIf (cfg.sshKeys != null) {