[tmux] Move local config back to the end of the tmux config

pull/28/head
Alpha Chen 10 years ago
parent 9708135ec4
commit 08f554766e

@ -7,4 +7,4 @@
- python
- python-pip
when: ansible_os_family == "Debian"
- command: pip install --user -e ~/.dotfiles/src/powerline
- command: pip install --user --editable=~/.dotfiles/src/powerline

@ -100,7 +100,6 @@ if-shell "[[ `tmux -V` =~ '1.9' ]]" \
unbind r
bind r source-file ~/.tmux.conf \; display 'Reloaded tmux.conf'
# TODO Figure out why this is order dependent
if-shell "[[ -e ~/.tmux.conf.local ]]" "source-file ~/.tmux.conf.local"
source-file ~/.dotfiles/src/powerline/powerline/bindings/tmux/powerline.conf
if-shell "[[ -e ~/.tmux.conf.local ]]" "source-file ~/.tmux.conf.local"

@ -64,6 +64,7 @@ set background=dark
colorscheme solarized
highlight Normal ctermbg=235
highlight rubyDefine ctermbg=235
set noshowmode
" has to go after solarized, wtf?
highlight LongLine term=reverse cterm=reverse ctermfg=1 guifg=Black guibg=Yellow
@ -201,6 +202,7 @@ let g:ctrlp_map = '<leader>p'
let g:ctrlp_match_window='bottom,order:btt,min:1,max:20'
let g:ctrlp_reuse_window='startify'
let g:ctrlp_working_path_mode='ra'
let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
" Startify
let g:startify_change_to_vcs_root = 1
@ -233,6 +235,9 @@ nmap <leader>vw<leader>i <plug>VimwikiDiaryGenerateLinks
" map <leader>vl :VimuxRunLastCommand<cr>
" map <leader>vq :VimuxCloseRunner<cr>
" NERDCommenter
let NERDSpaceDelims = 1
" gui stuff
set guioptions-=T
set guifont=Consolas:h9:cANSI

Loading…
Cancel
Save