diff --git a/tmux.conf b/tmux.conf index 6defdd1..eb5b625 100644 --- a/tmux.conf +++ b/tmux.conf @@ -24,7 +24,6 @@ set -g set-titles "on" set -g set-titles-string "[#h:#S] #W" set -g escape-time "0" set -g history-limit "10000" -set -g terminal-overrides ',rxvt-unicode-256color:Tc' set -g default-terminal "tmux-256color" set -g status "on" set -g status-interval 2 diff --git a/vimrc b/vimrc index b8f16cb..0dfe88c 100644 --- a/vimrc +++ b/vimrc @@ -67,7 +67,7 @@ if v:version >= 800 " enable packs based on filetype let g:ale_python_flake8_executable = 'python2' - autocmd FileType python packadd ale + autocmd FileType python packadd ale | packadd jedi-vim autocmd FileType sh packadd ale if $TERM != 'linux' diff --git a/zshrc b/zshrc index 08635fe..a856b52 100644 --- a/zshrc +++ b/zshrc @@ -242,7 +242,7 @@ s() { # prefer neovim over vim vim() { local vim - vim=$(whence nvim) || vimbin=$(whence vim) + vim=$(whence nvim) || vim=$(whence vim) $vim "$@" } # }}}