summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Wang2025-05-13 17:00:48 -0400
committerAnthony Wang2025-05-13 17:00:48 -0400
commit7c15ad24c4d34dc17f0afaf41cb1abb8cf4a504e (patch)
treeb0045ce32b5c329dc8c7c25bd666b18daf6ccc83
parent0e128780e2ed311a5e597c468754269e1ec96e2c (diff)
Revert "Don't start ssh-agent from fish in Termux, use runit instead"
This reverts commit 512c598f5de91faa5479b3024e30b8c847472564.
-rw-r--r--fish/config.fish14
1 files changed, 7 insertions, 7 deletions
diff --git a/fish/config.fish b/fish/config.fish
index 1716a7f..9b6b9f4 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,5 +1,12 @@
if status is-interactive
# Commands to run in interactive sessions can go here
+ # Detect if running in Termux
+ if test -n "$TERMUX_VERSION"
+ # SSH_ASKPASS requires an executable
+ set -gx SSH_ASKPASS ~/.config/fish/scripts/termux-ssh-askpass.fish
+ set -gx SSH_ASKPASS_REQUIRE force
+ eval (ssh-agent -c)
+ end
end
abbr -a -- o open
@@ -27,10 +34,3 @@ set -gx CARGO_HOME ~/.local/share/cargo
# https://docs.julialang.org/en/v1/manual/environment-variables/#JULIA_DEPOT_PATH
set -gx JULIA_DEPOT_PATH ~/.local/share/julia:
set -gx ELAN_HOME ~/.local/share/elan
-
-# Detect if running in Termux
-if test -n "$TERMUX_VERSION"
- # SSH_ASKPASS requires an executable
- set -gx SSH_ASKPASS ~/.config/fish/scripts/termux-ssh-askpass.fish
- set -gx SSH_ASKPASS_REQUIRE force
-end