Merge branch 'master' of github.com:uvaes/dotfiles

6 files changed, 46 insertions, 17 deletions

diff --git a/bashrc b/bashrc
index a5f83b7..d7d4121 100644
--- a/bashrc
+++ b/bashrc
@@ -112,3 +112,4 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
+[ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/nvim/mySnippets/cpp.snippets b/nvim/mySnippets/cpp.snippets
index e69de29..5ad9624 100644
--- a/nvim/mySnippets/cpp.snippets
+++ b/nvim/mySnippets/cpp.snippets
@@ -0,0 +1,19 @@
+snippet print_mat "Print matrix" b
+for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
+	cout << setw(12) << $1[iii][0];
+	for (unsigned int jjj = 1; jjj < $1.size(); ++jjj) {
+		cout << ", ";
+		cout << setw(12) << $1[iii][jjj];
+	}
+	cout << endl;
+}
+$0
+endsnippet
+
+snippet vec "vector" i
+vector<${1:double}> $0
+endsnippet
+
+snippet mat "matrix" i
+vector< vector<${1:double}> > $0
+endsnippet
diff --git a/nvimrc b/nvimrc
index 4b07ec9..44a70c0 100644
--- a/nvimrc
+++ b/nvimrc
@@ -1,6 +1,6 @@
 "" Plugins
 call plug#begin('~/.nvim/plugged')
-Plug 'airblade/vim-gitgutter'
+Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' }
 Plug 'altercation/vim-colors-solarized'
 Plug 'AndrewRadev/splitjoin.vim'
 Plug 'benekastah/neomake'
@@ -9,25 +9,26 @@ Plug 'christoomey/vim-tmux-navigator'
 Plug 'edkolev/tmuxline.vim'
 Plug 'freeo/vim-kalisi'
 Plug 'godlygeek/tabular'
-Plug 'gregsexton/gitv'
+Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
-Plug 'jamessan/vim-gnupg'
-Plug 'jeetsukumaran/vim-buffergator'
+Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
 Plug 'junegunn/seoul256.vim'
+Plug 'junegunn/fzf' , { 'on' : 'FZF' }
 Plug 'kien/ctrlp.vim'
-Plug 'LaTeX-Box-Team/latex-box'
+Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' }
 Plug 'majutsushi/tagbar'
 Plug 'mileszs/ack.vim'
 Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' }
-Plug 'scrooloose/nerdtree'
+Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
 Plug 'scrooloose/syntastic'
 Plug 'SirVer/ultisnips'
-Plug 'sjl/Gundo.vim'
+Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
 Plug 'szw/vim-ctrlspace'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'tomasr/molokai'
 Plug 'tommcdo/vim-exchange'
-Plug 'tpope/vim-abolish'
+Plug 'ton/vim-bufsurf'
+Plug 'tpope/vim-abolish', { 'for' : 'tex' }
 Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-obsession'
@@ -52,7 +53,7 @@ let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
 let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsListSnippets="<c-l>"
 let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
-let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
+let g:UltiSnipsSnippetsDir="~/.nvim/mySnippets"
 
 let g:airline_left_sep=''
 let g:airline_right_sep=''
@@ -63,9 +64,6 @@ let g:airline_theme='base16'
 let g:airline#extensions#tabline#enabled = 0
 let g:airline_exclude_preview = 0
 
-let g:buffergator_display_regime='bufname'
-let g:buffergator_vsplit_size=30
-
 let g:bufferline_active_buffer_left = ''
 let g:bufferline_active_buffer_right = ''
 let g:bufferline_echo = 0
@@ -193,7 +191,6 @@ nnoremap <Leader>ps :PlugStatus<cr>
 
 " Toggles
 nnoremap cop :set paste!<cr>
-nnoremap <Leader>tb :BuffergatorToggle<cr>
 nnoremap <Leader>tg :GitGutterToggle<cr>
 nnoremap <Leader>tn :NERDTreeToggle<cr>
 nnoremap <Leader>tt :TagbarToggle<cr>
@@ -216,6 +213,8 @@ nnoremap <Leader>fw :%s/\s\+$//<cr>
 nnoremap <Leader>fi zzmxgg=G'x
 
 " Navigation
+nnoremap (( :BufSurfBack<CR>
+nnoremap )) :BufSurfForward<CR>
 nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>
 nnoremap <Return> o<Esc>
@@ -246,8 +245,8 @@ nnoremap , :
 vnoremap , :
 
 " Neovim specific
-tmap <C-_> <C-\><C-n><C-^>
-nnoremap <C-_> :b term<cr>i
+tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
+nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
 inoremap <C-_> <Esc>:b term<cr>i
 
 "" Restore cursor position
diff --git a/vim/mySnippets/cpp.snippets b/vim/mySnippets/cpp.snippets
index e69de29..62c1faa 100644
--- a/vim/mySnippets/cpp.snippets
+++ b/vim/mySnippets/cpp.snippets
@@ -0,0 +1,10 @@
+snippet print_mat "Print matrix" b
+for (unsigned int iii = 0; iii < ${0:mat}.size(); ++iii) {
+	cout << setw(12) << mat[iii][0];
+	for (unsigned int jjj = 1; jjj < mat.size(); ++jjj) {
+		cout << ", ";
+		cout << setw(12) << mat[iii][jjj];
+	}
+	cout << endl;
+}
+endsnippet
diff --git a/vimrc b/vimrc
index d722075..f6b1027 100644
--- a/vimrc
+++ b/vimrc
@@ -35,7 +35,6 @@ Plugin 'tpope/vim-scriptease'
 Plugin 'tpope/vim-sensible'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-unimpaired'
-Plugin 'rdnetto/YCM-Generator'
 filetype plugin indent on
 syntax on
 
@@ -145,7 +144,7 @@ set spellfile="/home/urbain/.vim/spell/en.utf-8.add"
 set smartcase
 set ignorecase
 
-" Misc
+
 set noautochdir
 set cpoptions+=Iq
 set encoding=utf-8
diff --git a/zshrc b/zshrc
index 1807f5f..436e036 100644
--- a/zshrc
+++ b/zshrc
@@ -92,3 +92,4 @@ bindkey -a 'j' history-beginning-search-forward
 crontab ~/.crontab
 
 TERM=xterm-256color
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh