diff options
Diffstat (limited to 'config/essentials')
| -rw-r--r-- | config/essentials/shell/functions.sh | 31 | ||||
| -rw-r--r-- | config/essentials/zsh/.zshrc | 2 |
2 files changed, 18 insertions, 15 deletions
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh index 50ee0aa..7c8c777 100644 --- a/config/essentials/shell/functions.sh +++ b/config/essentials/shell/functions.sh @@ -366,20 +366,23 @@ edit_git_file () { $EDITOR "$1"/"$f" } -# Wrapper to automatically add the key -# could have been alias='SSH_ASKPASS=askpass SSH_ASKPASS_REQUIRE=prefer ssh' -# but this option is very slow for some reason -ssh() { - for arg in $@; do - if grep "Host $arg\s*\$" ~/.ssh/config > /dev/null 2>&1 ; - then - # Disable notification by unsetting the DISPLAY varibles - keyadd "$arg" 2> /dev/null - break - fi - done - /usr/bin/ssh $@ -} +if false +then + # Wrapper to automatically add the key + # could have been alias='SSH_ASKPASS=askpass SSH_ASKPASS_REQUIRE=prefer ssh' + # but this option is very slow for some reason + ssh() { + for arg in $@; do + if grep "Host $arg\s*\$" ~/.ssh/config > /dev/null 2>&1 ; + then + # Disable notification by unsetting the DISPLAY varibles + keyadd "$arg" 2> /dev/null + break + fi + done + /usr/bin/ssh $@ + } +fi ssl_req() { [ "$1" ] || return 1 diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc index 6b8a910..1204e2c 100644 --- a/config/essentials/zsh/.zshrc +++ b/config/essentials/zsh/.zshrc @@ -8,7 +8,7 @@ if { [ "$TTY" = "/dev/tty1" ] || [ "$TTY" = "/dev/tty8" ]; } && [ "$(id -u)" -ne eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents ssh,gpg)" if [ "$(hostname)" = "spring" ] then - keychain --dir "$XDG_CONFIG_HOME/keychain" --quiet --agents gpg 3A626DD20A32EB2E5DD9CE71CFD9ABC97158CD5D #FILTERED + keychain --dir "$XDG_CONFIG_HOME/keychain" --quiet --agents gpg IDENTITY #FILTERED fi exec startx > /dev/null 2>&1 exit |