Skip to content

gpg-agent: make shell integrations optional #2927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sumnerevans merged 2 commits into from
May 1, 2022
Merged

gpg-agent: make shell integrations optional #2927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d16f3a
gpg-agent: shell integration is configurable
crazymanjinn Apr 30, 2022
24b9306
gpg-agent: simplify shell option declarations
crazymanjinn Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions modules/services/gpg-agent.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,18 @@ in {
now.
'';
};

enableBashIntegration = mkEnableOption "Bash integration" // {
default = true;
};

enableZshIntegration = mkEnableOption "Zsh integration" // {
default = true;
};

enableFishIntegration = mkEnableOption "Fish integration" // {
default = true;
};
};
};

Expand Down Expand Up @@ -224,9 +236,9 @@ in {
fi
'';

programs.bash.initExtra = gpgInitStr;
programs.zsh.initExtra = gpgInitStr;
programs.fish.interactiveShellInit = ''
programs.bash.initExtra = mkIf cfg.enableBashIntegration gpgInitStr;
programs.zsh.initExtra = mkIf cfg.enableZshIntegration gpgInitStr;
programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
set -gx GPG_TTY (tty)
'';
}
Expand Down