Merge branch 'main' of https://git.sagev.space/sage/dotfiles
This commit is contained in:
commit
da0351e640
3
copy.sh
3
copy.sh
|
@ -130,6 +130,7 @@ if ! test -f "$HOME/.local/share/fonts/FiraCodeNerdFontMono-Medium.ttf"; then
|
||||||
fc-cache -f -v
|
fc-cache -f -v
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$(hostname)" != "sage-bigboy" ]]; then
|
||||||
curdir="$(pwd)"
|
curdir="$(pwd)"
|
||||||
cd $SCRIPT_DIR || exit 1
|
cd $SCRIPT_DIR || exit 1
|
||||||
if test -d git-mirror-machine; then
|
if test -d git-mirror-machine; then
|
||||||
|
@ -139,8 +140,8 @@ else
|
||||||
git clone 'https://git.sagev.space/sage/git-mirror-machine.git'
|
git clone 'https://git.sagev.space/sage/git-mirror-machine.git'
|
||||||
cd git-mirror-machine
|
cd git-mirror-machine
|
||||||
fi
|
fi
|
||||||
./mirror.sh
|
|
||||||
cd "$curdir" || exit 1
|
cd "$curdir" || exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
if ! command -v fzf &> /dev/null; then
|
if ! command -v fzf &> /dev/null; then
|
||||||
echo "You may wish to install fzf for sofi and other search"
|
echo "You may wish to install fzf for sofi and other search"
|
||||||
|
|
|
@ -257,6 +257,10 @@ function _pushdot {
|
||||||
git push -u origin main
|
git push -u origin main
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if [[ "$(hostname)" == "sage-bigboy" ]]; then
|
||||||
|
cd - > /dev/null
|
||||||
|
return $res
|
||||||
|
fi
|
||||||
push-extensions | tee -a "$SYNC_LOCK_FILE"
|
push-extensions | tee -a "$SYNC_LOCK_FILE"
|
||||||
sync-history | tee -a "$SYNC_LOCK_FILE"
|
sync-history | tee -a "$SYNC_LOCK_FILE"
|
||||||
push-dconf | tee -a "$SYNC_LOCK_FILE"
|
push-dconf | tee -a "$SYNC_LOCK_FILE"
|
||||||
|
@ -297,6 +301,10 @@ function _getdot {
|
||||||
fi
|
fi
|
||||||
cd "$DOT_DIR" || return 1
|
cd "$DOT_DIR" || return 1
|
||||||
git pull && ./copy.sh | tee -a "$SYNC_LOCK_FILE"
|
git pull && ./copy.sh | tee -a "$SYNC_LOCK_FILE"
|
||||||
|
if [[ "$(hostname)" == "sage-bigboy" ]]; then
|
||||||
|
cd - > /dev/null
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
sync-history | tee -a "$SYNC_LOCK_FILE"
|
sync-history | tee -a "$SYNC_LOCK_FILE"
|
||||||
load-extensions | tee -a "$SYNC_LOCK_FILE"
|
load-extensions | tee -a "$SYNC_LOCK_FILE"
|
||||||
|
|
Loading…
Reference in New Issue