diff options
| -rwxr-xr-x | config/zsh/zprofile | 15 | ||||
| -rwxr-xr-x | install | 11 | ||||
| -rwxr-xr-x | local/bin/clout | 4 |
3 files changed, 19 insertions, 11 deletions
diff --git a/config/zsh/zprofile b/config/zsh/zprofile index 660327e..880b230 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -62,9 +62,12 @@ export LESS_TERMCAP_ZW=$(tput rsupm) export MINIKUBE_IN_STYLE=false # disable cringe minikube emojies -[ "$(tty)" = '/dev/tty1' ] && - { - xmonad --recompile - startx "$XDG_CONFIG_HOME/x11/xinitrc" - poweroff - } +export CLOUT_SYNC_DIR="clout-sync/" +export CLOUT_SYNC_PATH="${XDG_DATA_HOME:-$HOME/.sync}/$CLOUT_SYNC_DIR" + +if [ "$(tty)" = '/dev/tty1' ] +then + xmonad --recompile + startx "$XDG_CONFIG_HOME/x11/xinitrc" + poweroff +fi @@ -1,5 +1,9 @@ #!/bin/sh +# zprofile isn't installed yet on new machine +# shellcheck source=/dev/null +. config/zsh/zprofile + [ "$USER" = 'root' ] && { crontab 'crontab/root.crontab' ; exit ; } mkdir -pv "$XDG_CONFIG_HOME" @@ -35,9 +39,10 @@ ln -svf "$(pwd)/config/zsh/zprofile" "$HOME/.zprofile" # sync install ################################################################################ -CACHARLE_SYNC_PATH="$HOME/cacharle-sync" -[ -d "$CACHARLE_SYNC_PATH" ] && - ln -svf "$CACHARLE_SYNC_PATH/newsboat-urls" "$XDG_CONFIG_HOME/newsboat/urls" +echo '---------------------------- SYNC FILE LINKS ----------------------------' +mkdir -pv "$CLOUT_SYNC_PATH" +ln -svf "$CLOUT_SYNC_PATH/newsboat/urls" "$XDG_CONFIG_HOME/newsboat/urls" +ln -svf "$CLOUT_SYNC_PATH/qutebrowser/bookmarks/urls" "$XDG_CONFIG_HOME/qutebrowser/bookmarks/urls" ################################################################################ # vim plug diff --git a/local/bin/clout b/local/bin/clout index 76320da..51fa3b7 100755 --- a/local/bin/clout +++ b/local/bin/clout @@ -25,8 +25,8 @@ remote_host=cacharle.xyz remote="$remote_user@$remote_host" # '/' suffix is significant for rsync to know if it needs to copy in the directory or the directory itself -sync_dir="clout-sync/" -sync_path="${XDG_DATA_HOME:-$HOME/.sync}/$sync_dir" +sync_dir=${CLOUT_SYNC_DIR:-'clout-sync/'} +sync_path="${CLOUT_SYNC_PATH:-"${XDG_DATA_HOME:-"$HOME/.sync"}/$sync_dir"}" create_sync_dirs() { # --mkpath only available in latest version of rsync (not in debian repositories) |