geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Merge branch 'crash' into master

Browse source 
Heh I don't have a half bad memory!
This commit is contained in:
Geoffrey Frogeye 2020-08-20 21:40:37 +02:00
parent e56dc7b96c 42d8503928
commit 35d4c10919
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
config/i3/pitch.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 67 B

6
config/scripts/machines
View file

@ -416,7 +416,11 @@ machines_n_help() { machines_network_help "$@"; }
function machines_update-all { function machines_update-all {
machines_machine_list | while read -r machine; do machines_machine_list | while read -r machine; do
echo "Updating $machine..." 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 done
} }

8
config/shell/shenv
View file

@ -106,10 +106,14 @@ prependpath "$HOME/.config/scripts"
prependpath "$HOME/.termux/bin" prependpath "$HOME/.termux/bin"
) )
# For superseding commands with better ones if they are present
if grep -q enable-ssh-support "$GNUPGHOME/gpg-agent.conf" 2> /dev/null # SSH Agent
# If GPG agent is configured for SSH
if grep -q ^enable-ssh-support$ $GNUPGHOME/gpg-agent.conf 2> /dev/null
then then
# Use GPG as SSH agent # Load GPG agent
unset SSH_AGENT_PID unset SSH_AGENT_PID
if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"