Mercurial > dotfiles.old

comparison vimrc @ 188:51d25ca2f262

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updates to tmuxline config
author zegervdv <zegervdv@me.com>
date Sat, 08 Nov 2014 19:01:14 +0100
parents e3639166a8ab
children 925861e874ec
comparison
equal deleted inserted replaced
187:e3639166a8ab 188:51d25ca2f262
24 " Undo 24 " Undo
25 Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' } 25 Plug 'sjl/gundo.vim', { 'on': 'GundoToggle' }
26 26
27 " Tmux 27 " Tmux
28 Plug 'benmills/vimux', { 'on': 'VimuxRunCommand' } 28 Plug 'benmills/vimux', { 'on': 'VimuxRunCommand' }
29 Plug 'edkolev/tmuxline.vim', { 'on': 'TmuxLineSnapshot' } 29 Plug 'edkolev/tmuxline.vim', { 'on': 'TmuxlinSnapshot' }
30 30
31 " Search and Complete 31 " Search and Complete
32 Plug 'Shougo/neocomplete' 32 Plug 'Shougo/neocomplete'
33 Plug 'Shougo/neosnippet' 33 Plug 'Shougo/neosnippet'
34 Plug 'Shougo/neosnippet-snippets' 34 Plug 'Shougo/neosnippet-snippets'
53 Plug 'vim-scripts/a.vim', { 'for': 'c' } 53 Plug 'vim-scripts/a.vim', { 'for': 'c' }
54 Plug 'osyo-manga/vim-reunions', { 'for': 'c' } 54 Plug 'osyo-manga/vim-reunions', { 'for': 'c' }
55 Plug 'osyo-manga/vim-marching', { 'for': 'c' } 55 Plug 'osyo-manga/vim-marching', { 'for': 'c' }
56 56
57 " Python 57 " Python
58 Plug 'davidhalter/jedi-vim', { 'for': 'python' } 58 " Plug 'davidhalter/jedi-vim', { 'for': 'python' }
59 59
60 " Coffeescript 60 " Coffeescript
61 Plug 'kchmck/vim-coffee-script', { 'for': 'coffeescript' } 61 Plug 'kchmck/vim-coffee-script', { 'for': 'coffeescript' }
62 62
63 " Dependencies 63 " Dependencies
157 set pastetoggle=<F2> 157 set pastetoggle=<F2>
158 set clipboard=unnamed 158 set clipboard=unnamed
159 159
160 set undofile 160 set undofile
161 set viminfo='10,\"100,:20,%,n~/.viminfo 161 set viminfo='10,\"100,:20,%,n~/.viminfo
162 162 set backupdir=/tmp//,.
163 set directory=/tmp//,.
164 if v:version >= 703
165 set undodir=/tmp//,.
166 endif
163 set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.o,*.bin,*.elf,*.hex 167 set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*.o,*.bin,*.elf,*.hex
164 168
165 " Sentences are ended with double spaces 169 " Sentences are ended with double spaces
166 set cpo+=J 170 set cpo+=J
167 171
316 320
317 " Note that this will overwrite the contents of the z mark. I never use it, but 321 " Note that this will overwrite the contents of the z mark. I never use it, but
318 " if you do you'll probably want to use another mark. 322 " if you do you'll probably want to use another mark.
319 inoremap <C-u> <esc>mzgUiw`za 323 inoremap <C-u> <esc>mzgUiw`za
320 324
321 nnoremap <leader>ev :vsplit $MYVIMRC<cr> 325 nnoremap <leader>ev :split $MYVIMRC<cr>
322 326
323 " Move lines from visual selection 327 " Move lines from visual selection
324 vnoremap <S-j> :m '>+1<CR>gv=gv 328 vnoremap <S-j> :m '>+1<CR>gv=gv
325 vnoremap <S-k> :m '<-2<CR>gv=gv 329 vnoremap <S-k> :m '<-2<CR>gv=gv
326 330
543 let g:jedi#completions_enabled = 0 547 let g:jedi#completions_enabled = 0
544 " }}} 548 " }}}
545 " Vimux {{{ 549 " Vimux {{{
546 let g:VimuxUseNearest = 1 550 let g:VimuxUseNearest = 1
547 nnoremap <buffer> <silent><leader>s :w<CR> 551 nnoremap <buffer> <silent><leader>s :w<CR>
548 autocmd FileType python nnoremap <buffer> <silent><leader>s :w<CR>:call VimuxRunCommand('%run -i ' . expand('%'))<CR> 552 autocmd FileType python nnoremap <buffer> <silent><leader>s :w<CR>:VimuxRunCommand('%run -i ' . expand('%'))<CR>
549 autocmd FileType ruby nnoremap <buffer> <silent><leader>s :w<CR>:call VimuxRunCommand('rake spec')<CR> 553 autocmd FileType ruby nnoremap <buffer> <silent><leader>s :w<CR>:VimuxRunCommand('rake spec')<CR>
550 autocmd FileType c nnoremap <buffer> <silent><leader>s :w<CR>:call VimuxRunCommand('make')<CR> 554 autocmd FileType c nnoremap <buffer> <silent><leader>s :w<CR>:VimuxRunCommand('make')<CR>
551 " }}} 555 " }}}
552 " Tmuxline {{{ 556 " Tmuxline {{{
553 let g:tmuxline_powerline_separators=0 557 let g:tmuxline_powerline_separators=0
558 let g:tmuxline_preset = {
559 \ 'a': '#S',
560 \ 'b': '#F',
561 \ 'c': '#W',
562 \ 'win': ['#I', '#W'],
563 \ 'cwin': ['#I', '#W'],
564 \ 'y': ['%a %b %d', '%R'],
565 \ 'z': '#h'}
554 " }}} 566 " }}}
555 " After-objects {{{ 567 " After-objects {{{
556 autocmd VimEnter * call after_object#enable('=', ':', '-', '#', ' ') 568 autocmd VimEnter * call after_object#enable('=', ':', '-', '#', ' ')
557 " }}} 569 " }}}
558 570