Fix some weird termux-ssh-askpass bugs, enable ssh-agent

Changes

2 changed files (+13/-9)

• 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
  • @@ -26,10 +33,3 @@ set -gx CARGO_HOME ~/.local/share/cargo
    # Trailing : is necessary! # https://docs.julialang.org/en/v1/manual/environment-variables/#JULIA_DEPOT_PATH set -gx JULIA_DEPOT_PATH ~/.local/share/julia: - - # 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
• fish/scripts/termux-ssh-askpass.fish
  • @@ -1,6 +1,10 @@
    #!/usr/bin/env fish # https://microsounds.github.io/notes/termux-ssh-fingerprint.htm - # Fingerprint unlock then sign nonce value + # Unlock keystore with fingerprint + termux-fingerprint > /dev/null + # Sign nonce value + # Now it seems more elegant to sign the result of termux-fingerprint in a one-liner + # But this can cause weird bugs so let's just play it safe instead of elegant # No ed25519 support sad - termux-fingerprint | termux-keystore sign default SHA256withRSA | base64 -w 0 + echo nonce | termux-keystore sign default SHA256withRSA | base64 -w 0