diff --git a/prepare.sh b/prepare.sh index 664ebe7..0ccac28 100644 --- a/prepare.sh +++ b/prepare.sh @@ -38,7 +38,7 @@ fi if [[ ! -f "$HOME/.tmux.conf" ]]; then mkdir -p ${HOME}/.config/tmux/plugins git clone https://github.com/tmux-plugins/tpm ${HOME}/.config/tmux/plugins/tpm - ln -sf "${DOTFILES}/tmux.conf" "$HOME/.tmux.conf" + ln -sf "${DOTFILES}/tmux.conf" "$HOME/.config/tmux/tmux.conf" echo "Please, open Tmux and run 'prefix I'." fi diff --git a/tmux.conf b/tmux.conf index aa08179..0fe2112 100644 --- a/tmux.conf +++ b/tmux.conf @@ -14,4 +14,4 @@ set -g @tmux_power_time_format '%H:%M' set -g @tmux_power_date_icon '' set -g @tmux_power_time_icon '' -run '~/.tmux/plugins/tpm/tpm' +run '~/.config/tmux/plugins/tpm/tpm' diff --git a/zsh/plugins/tmux.plugin.zsh b/zsh/plugins/tmux.plugin.zsh index 311c2e6..db8496a 100644 --- a/zsh/plugins/tmux.plugin.zsh +++ b/zsh/plugins/tmux.plugin.zsh @@ -26,7 +26,7 @@ fi # systems without the proper terminfo : ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color} # Set the configuration path -: ${ZSH_TMUX_CONFIG:=$HOME/.tmux.conf} +: ${ZSH_TMUX_CONFIG:=$HOME/.config/tmux/tmux.conf} # Set -u option to support unicode : ${ZSH_TMUX_UNICODE:=false} diff --git a/zshrc b/zshrc index 1e1cd9c..2b1685e 100644 --- a/zshrc +++ b/zshrc @@ -25,6 +25,7 @@ done # EDITOR export EDITOR="/usr/bin/vim" +export ZSH_TMUX_CONFIG=${HOME}/.config/tmux/tmux.conf # FZF default options [ -x `which fzf 2>/dev/null` ] && export FZF_DEFAULT_OPTS="--multi --no-mouse --ansi --color=dark"