1
0
mirror of https://github.com/bertptrs/vimconfig.git synced 2025-12-27 21:40:31 +01:00

Compare commits

...

2 Commits

Author SHA1 Message Date
3769dadebc Remove now-useless SSH workaround 2022-03-10 17:02:47 +01:00
571318a6e1 More long-running exceptions 2022-03-10 17:02:47 +01:00

View File

@@ -61,13 +61,14 @@ fpath+=("$ZDOTDIR/plugins/nix-zsh-completions")
AUTO_NOTIFY_IGNORE+=( AUTO_NOTIFY_IGNORE+=(
"gcloud compute ssh" "gcloud compute ssh"
"nix run" "nix run"
"git"
"bash" "bash"
"sem debug" "sem debug"
"git log" "git "{commit,grep,log}
"journalctl" "journalctl"
"jekyll serve" "jekyll serve"
"sudoedit" "sudoedit"
"ipython"{,3}
"sem "{attach,debug}
) )
@@ -92,7 +93,7 @@ alias wget="wget --hsts-file=\"$XDG_CACHE_HOME/wget-hsts\""
alias makej="make -j$(nproc)" alias makej="make -j$(nproc)"
alias sdc='sudo docker-compose' alias sdc='sudo docker-compose'
alias nrc='nix run -c' alias nrc='nix run -c'
alias gcs='gcloud compute ssh' alias gcs='gcloud compute ssh --tunnel-through-iap'
alias gscp='gcloud compute scp' alias gscp='gcloud compute scp'
alias gci='gcloud compute instances' alias gci='gcloud compute instances'
@@ -290,28 +291,3 @@ if (( $+commands[bat] )); then
# And replace cat while we're at it # And replace cat while we're at it
alias cat='bat' alias cat='bat'
fi fi
############################
# Special SSH key handling #
############################
if [[ -f ~/.ssh/id_ed25519 ]]; then
# gnome-keyring doesn't handle ed25519 keys properly; try setting up an alternative agent.
export SSH_ENV="$HOME/.ssh/environment"
start_agent() {
echo "Initialising new SSH agent..."
/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
echo Succeeded
chmod 600 "${SSH_ENV}"
. "${SSH_ENV}" > /dev/null
/usr/bin/ssh-add ~/.ssh/google_compute_engine >/dev/null 2>&1
}
if [ -f "${SSH_ENV}" ]; then
. "${SSH_ENV}" > /dev/null
kill -0 "$SSH_AGENT_PID" 2>/dev/null || { start_agent; }
else
start_agent
fi
fi