diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 6c2c93f..87ff9d2 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -31,6 +31,6 @@ bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel # Open panes in current directory bind '"' split-window -v -c "#{pane_current_path}" -bind % split-window -h -c "#{pane-current_path}" +bind % split-window -h -c "#{pane_current_path}" run '~/.tmux/plugins/tpm/tpm' diff --git a/.zshrc b/.zshrc index f23dbf7..b7eef00 100644 --- a/.zshrc +++ b/.zshrc @@ -67,7 +67,8 @@ zstyle ':fzf-tab:complete:cd:*' fzf-preview 'ls --color $realpath' zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath' # Aliases -alias ls='ls --color' +alias ls='ls --color=auto' +alias grep='grep --color=auto' alias v='nvim' alias c='clear' @@ -76,6 +77,6 @@ eval "$(fzf --zsh)" eval "$(zoxide init --cmd cd zsh)" # Automatically start Tmux -if [ -x "$(command -v tmux)" ] && [ -n "${DISPLAY}" ] && [ -z "${TMUX}" ]; then +if [ -x "$(command -v tmux)" ] && [ -n "${DISPLAY}" ] && [ -z "${TMUX}" ] && [[ "$TERM_PROGRAM" != "vscode" ]]; then exec tmux new-session -A -s ${USER} >/dev/null 2>&1 fi