summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bashrc1
-rw-r--r--latexmkrc2
-rw-r--r--nvimrc25
-rw-r--r--zshrc1
4 files changed, 16 insertions, 13 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/latexmkrc b/latexmkrc
index 533dbdd..a76cf2b 100644
--- a/latexmkrc
+++ b/latexmkrc
@@ -1,5 +1,5 @@
$pdf_mode = 1;
$pdf_previewer = 'zathura -s -x "vim --servername SYNC --remote +%{line} %{input}" %O %S';
-$clean_ext = "synctex.gz bbl pdf";
+$clean_ext = "synctex.gz bbl pdf dvi";
$new_viewer_always [0];
diff --git a/nvimrc b/nvimrc
index c236461..20ac746 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,24 +9,25 @@ 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 '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 '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 'ton/vim-bufsurf'
-Plug 'tpope/vim-abolish'
+Plug 'tpope/vim-abolish', { 'for' : 'tex' }
Plug 'tpope/vim-commentary'
Plug 'tpope/vim-fugitive'
Plug 'tpope/vim-obsession'
@@ -51,7 +52,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=''
@@ -209,8 +210,8 @@ nnoremap <Leader>fw :%s/\s\+$//<cr>
nnoremap <Leader>fi zzmxgg=G'x
" Navigation
-nnoremap [[ :BufSurfBack<CR>
-nnoremap ]] :BufSurfForward<CR>
+nnoremap (( :BufSurfBack<CR>
+nnoremap )) :BufSurfForward<CR>
nnoremap <c-y> 3<c-y>
nnoremap <c-e> 3<c-e>
nnoremap <Return> o<Esc>
@@ -243,8 +244,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/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