Post crash
This commit is contained in:
parent
7ebbfb5186
commit
42d8503928
BIN
config/i3/pitch.png
Normal file
BIN
config/i3/pitch.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 67 B |
|
@ -416,7 +416,11 @@ machines_n_help() { machines_network_help "$@"; }
|
|||
function machines_update-all {
|
||||
machines_machine_list | while read -r machine; do
|
||||
echo "Updating $machine..."
|
||||
ssh "$machine" 'cd .dotfiles && git pull; machines update' &
|
||||
if [ $machine = $(cat "$MACHINES_CONFIG/this.name") ]; then
|
||||
machines_update
|
||||
continue
|
||||
fi
|
||||
ssh -n "$machine" 'cd .dotfiles; git pull; ./config/scripts/machines update'
|
||||
done
|
||||
}
|
||||
|
||||
|
|
|
@ -10,27 +10,6 @@ export EDITOR=nvim
|
|||
export VISUAL=nvim
|
||||
export BROWSER=firefox
|
||||
|
||||
# Load ssh-agent... ONCE
|
||||
|
||||
SSH_ENV="$HOME/.ssh/environment"
|
||||
|
||||
start_agent() {
|
||||
ssh-agent > "${SSH_ENV}"
|
||||
chmod 600 "${SSH_ENV}"
|
||||
. "${SSH_ENV}" > /dev/null
|
||||
}
|
||||
|
||||
if [ -f "${SSH_ENV}" ]
|
||||
then
|
||||
. "${SSH_ENV}" > /dev/null
|
||||
if [ ! -d "/proc/${SSH_AGENT_PID}" ] || [ "$(cat "/proc/${SSH_AGENT_PID}/comm")" != "ssh-agent" ]
|
||||
then
|
||||
start_agent
|
||||
fi
|
||||
else
|
||||
start_agent
|
||||
fi
|
||||
|
||||
direnv() { # environment variable name, path
|
||||
export "$1"="$2"
|
||||
mkdir -p "$2"
|
||||
|
@ -128,3 +107,38 @@ prependpath "$HOME/.config/scripts"
|
|||
)
|
||||
|
||||
# For superseding commands with better ones if they are present
|
||||
|
||||
# SSH Agent
|
||||
|
||||
# If GPG agent is configured for SSH
|
||||
if grep -q ^enable-ssh-support$ $GNUPGHOME/gpg-agent.conf 2> /dev/null
|
||||
then
|
||||
# Load GPG agent
|
||||
unset SSH_AGENT_PID
|
||||
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
|
||||
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
||||
fi
|
||||
export GPG_TTY=$(tty)
|
||||
gpg-connect-agent updatestartuptty /bye >/dev/null
|
||||
|
||||
else
|
||||
# Load ssh-agent... ONCE
|
||||
SSH_ENV="$HOME/.ssh/environment"
|
||||
|
||||
start_agent() {
|
||||
ssh-agent > "${SSH_ENV}"
|
||||
chmod 600 "${SSH_ENV}"
|
||||
. "${SSH_ENV}" > /dev/null
|
||||
}
|
||||
|
||||
if [ -f "${SSH_ENV}" ]
|
||||
then
|
||||
. "${SSH_ENV}" > /dev/null
|
||||
if [ ! -d "/proc/${SSH_AGENT_PID}" ] || [ "$(cat "/proc/${SSH_AGENT_PID}/comm")" != "ssh-agent" ]
|
||||
then
|
||||
start_agent
|
||||
fi
|
||||
else
|
||||
start_agent
|
||||
fi
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue