nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

ssh-agent: add shell integrations

Browse source 
replaces `home.sessionVariablesExtra`
This commit is contained in:
jaredmontoya 2025-09-29 12:27:05 +02:00 • committed by Austin Horstman
parent 3557df69ee
commit c0016dd147
1 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
modules/services/ssh-agent.nix
View file

@ -35,6 +35,14 @@ in
Set a default value for the maximum lifetime in seconds of identities added to the agent. 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 { config = lib.mkIf cfg.enable {
@ -42,11 +50,35 @@ in
(lib.hm.assertions.assertPlatform "services.ssh-agent" pkgs lib.platforms.linux) (lib.hm.assertions.assertPlatform "services.ssh-agent" pkgs lib.platforms.linux)
]; ];
home.sessionVariablesExtra = '' programs =
if [ -z "$SSH_AUTH_SOCK" ]; then let
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/${cfg.socket} bashIntegration = ''
fi 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 = { systemd.user.services.ssh-agent = {
Install.WantedBy = [ "default.target" ]; Install.WantedBy = [ "default.target" ];