diff options
Diffstat (limited to '.bin/dot-sync')
| -rwxr-xr-x | .bin/dot-sync | 41 |
1 files changed, 23 insertions, 18 deletions
diff --git a/.bin/dot-sync b/.bin/dot-sync index 0643086..f12f878 100755 --- a/.bin/dot-sync +++ b/.bin/dot-sync @@ -1,29 +1,34 @@ #!/bin/sh -set -x -e +set -xe export GIT_SSH_COMMAND="ssh -o ConnectTimeout=1 -o ConnectionAttempts=1" -yadm pull +yadm stash +yadm pull --rebase +yadm stash pop yadm add -u yadm add \ - $HOME/.bin \ - $HOME/.config/i3 \ - $HOME/.config/neomutt \ - $HOME/.config/newsboat \ - $HOME/.config/nvim \ - $HOME/.config/qutebrowser/*.py \ - $HOME/.config/qutebrowser/bookmarks \ - $HOME/.config/qutebrowser/greasemonkey \ - $HOME/.config/qutebrowser/quickmarks \ - $HOME/.config/qutebrowser/userscripts/*.py \ - $HOME/.config/sway \ - $HOME/.config/task \ - $HOME/.config/yadm \ - $HOME/.config/waybar \ - $HOME/.config/zk \ - $HOME/.public-keys + "${HOME}/.bin" \ + "${HOME}/.config/cmus/playlists" \ + "${HOME}/.config/i3" \ + "${HOME}/.config/mpv/mpv.conf" \ + "${HOME}/.config/mpv/scripts" \ + "${HOME}/.config/neomutt" \ + "${HOME}/.config/newsboat" \ + "${HOME}/.config/nvim" \ + "${HOME}/.config/qutebrowser/*.py" \ + "${HOME}/.config/qutebrowser/bookmarks" \ + "${HOME}/.config/qutebrowser/greasemonkey" \ + "${HOME}/.config/qutebrowser/quickmarks" \ + "${HOME}/.config/qutebrowser/userscripts/*.py" \ + "${HOME}/.config/sway" \ + "${HOME}/.config/task" \ + "${HOME}/.config/yadm" \ + "${HOME}/.config/waybar" \ + "${HOME}/.config/zk" \ + "${HOME}/.public-keys" yadm push |