Skip to content

Commit a469b11

Browse files
committed
ssh-agent: remove shell integration options
It is crucial that `SSH_AUTH_SOCK` is set.
1 parent b6686f2 commit a469b11

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

modules/services/ssh-agent.nix

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ in
3636
Set a default value for the maximum lifetime in seconds of identities added to the agent.
3737
'';
3838
};
39-
40-
enableBashIntegration = lib.hm.shell.mkBashIntegrationOption { inherit config; };
41-
42-
enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; };
43-
44-
enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { inherit config; };
45-
46-
enableNushellIntegration = lib.hm.shell.mkNushellIntegrationOption { inherit config; };
4739
};
4840

4941
config = lib.mkIf cfg.enable (
@@ -84,13 +76,13 @@ in
8476
'';
8577
in
8678
{
87-
bash.profileExtra = lib.mkIf cfg.enableBashIntegration (lib.mkBefore bashIntegration);
79+
bash.profileExtra = lib.mkBefore bashIntegration;
8880

89-
zsh.envExtra = lib.mkIf cfg.enableZshIntegration (lib.mkBefore bashIntegration);
81+
zsh.envExtra = lib.mkBefore bashIntegration;
9082

91-
fish.shellInit = lib.mkIf cfg.enableFishIntegration (lib.mkBefore fishIntegration);
83+
fish.shellInit = lib.mkBefore fishIntegration;
9284

93-
nushell.extraConfig = lib.mkIf cfg.enableNushellIntegration (lib.mkBefore nushellIntegration);
85+
nushell.extraConfig = lib.mkBefore nushellIntegration;
9486
};
9587
}
9688

0 commit comments

Comments
 (0)