diff options
| -rw-r--r-- | tmux.conf | 3 | ||||
| -rw-r--r-- | vim/mySnippets/mail.snippets | 4 | ||||
| -rw-r--r-- | vimrc | 18 | ||||
| -rw-r--r-- | zshrc | 1 |
4 files changed, 15 insertions, 11 deletions
@@ -22,7 +22,8 @@ set -g @tpm_plugins ' \ ' set -g @resurrect-strategy-vim 'session' -set -g @resurrect-processes '"grunt->grunt serve"' +set -g @resurrect-save 'S' +set -g @resurrect-restore 'R' is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"' bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L" diff --git a/vim/mySnippets/mail.snippets b/vim/mySnippets/mail.snippets index 293256a..c512f9b 100644 --- a/vim/mySnippets/mail.snippets +++ b/vim/mySnippets/mail.snippets @@ -25,3 +25,7 @@ Gros bisous, Urbain endsnippet + +snippet look "I'm looking forward to ..." b +I am looking forward to hearing from you, +endsnippet @@ -5,11 +5,12 @@ call vundle#rc() "" Plugins Plugin 'gmarik/vundle' -Plugin 'istib/vifm.vim' Plugin 'LaTeX-Box-Team/latex-box' Plugin 'SirVer/ultisnips' Plugin 'altercation/vim-colors-solarized' +Plugin 'bling/vim-airline' Plugin 'christoomey/vim-tmux-navigator' +Plugin 'edkolev/tmuxline.vim' Plugin 'godlygeek/tabular' Plugin 'gregsexton/gitv' Plugin 'honza/vim-snippets' @@ -26,9 +27,6 @@ Plugin 'tpope/vim-scriptease' Plugin 'tpope/vim-sensible' Plugin 'tpope/vim-surround' Plugin 'tpope/vim-unimpaired' -Plugin 'bling/vim-airline' -" Plugin 'bling/vim-bufferline' -Plugin 'edkolev/tmuxline.vim' filetype plugin indent on syntax on @@ -57,7 +55,7 @@ let g:airline_left_sep='' let g:airline_right_sep='' let g:airline_section_c = '' let g:airline_section_x = '' -let g:airline_section_y = '%f' +let g:airline_section_y = '%f%m' let g:airline_section_z = '%3p%%|%3l|%3c' let g:airline_theme='solarized' let g:airline#extensions#tabline#enabled = 0 @@ -75,11 +73,6 @@ let g:ctrlp_open_new_file = 't' let g:ctrlp_show_hidden = 1 let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] let g:ctrlp_working_path_mode = 'r' -let g:ctrlp_prompt_mappings = { -\ 'PrtSelectMove("j")': ['<c-n>'], -\ 'PrtSelectMove("k")': ['<c-p>'], -\ 'PrtHistory(-1)': ['<down>'], -\ 'PrtHistory(1)': ['<up>'],} let g:syntastic_cpp_compiler = 'clang++' let g:syntastic_cpp_compiler_options = ' -std=c++11 -stdlib=libc++' @@ -92,6 +85,9 @@ let g:tmuxline_preset = {'a':'#H','b':'#S','win':'#W','cwin':'#W','x':'%R','y':' let g:tmuxline_separators = {'left':'','left_alt':'>','right':'','right_alt':'<','space':' '} let g:tmuxline_theme='airline' +" let g:ycm_key_list_select_completion=[] +" let g:ycm_key_list_previous_completion=[] + " Gundo nnoremap <F5> :GundoToggle<cr> @@ -177,6 +173,8 @@ nnoremap <Leader>i mxgg=G'x nnoremap <Leader>sw :%s/\s\+$//<cr> nnoremap <tab> <C-^> +nnoremap <LocalLeader>h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp,<CR> + nnoremap <Return> o<Esc> nnoremap <s-Return> O<Esc> nnoremap J mzJ`z @@ -59,6 +59,7 @@ alias va="vim --servername SYNC main.tex \ sections/sec3.tex \ sections/conclusion.tex" alias c='clear' +alias mc='make clean' alias m='mutt' alias a='vifm' alias mn='vim ~/.mynotes' |