Skip to content

ssh-agent: add shell integrations #8099

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
khaneliman merged 1 commit into from
Nov 1, 2025
Merged

ssh-agent: add shell integrations #8099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 37 additions & 5 deletions modules/services/ssh-agent.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,50 @@ in
Set a default value for the maximum lifetime in seconds of identities added to the agent.
'';
};

enableBashIntegration = lib.hm.shell.mkBashIntegrationOption { inherit config; };

enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; };

enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { inherit config; };

enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption { inherit config; };
};

config = lib.mkIf cfg.enable {
assertions = [
(lib.hm.assertions.assertPlatform "services.ssh-agent" pkgs lib.platforms.linux)
];

home.sessionVariablesExtra = ''
if [ -z "$SSH_AUTH_SOCK" ]; then
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/${cfg.socket}
fi
'';
programs =
let
bashIntegration = ''
if [ -z "$SSH_AUTH_SOCK" ]; then
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/${cfg.socket}
fi
'';

fishIntegration = ''
if test -z "$SSH_AUTH_SOCK"
set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/${cfg.socket}
end
'';

nushellIntegration = ''
if "SSH_AUTH_SOCK" not-in $env {
$env.SSH_AUTH_SOCK = $"($env.XDG_RUNTIME_DIR)/${cfg.socket}"
}
'';
in
{
bash.initExtra = lib.mkIf cfg.enableBashIntegration bashIntegration;

zsh.initContent = lib.mkIf cfg.enableZshIntegration bashIntegration;

fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration fishIntegration;

nushell.extraConfig = lib.mkIf cfg.enableNushellIntegration nushellIntegration;
};

systemd.user.services.ssh-agent = {
Install.WantedBy = [ "default.target" ];
Expand Down