diff options
Diffstat (limited to 'vim/.vimrc')
| -rw-r--r-- | vim/.vimrc | 22 |
1 files changed, 13 insertions, 9 deletions
@@ -1,11 +1,9 @@ -"" Definition of leaders let mapleader = " " let maplocalleader = "\\" "" Plugins call plug#begin('~/.vim/plugged') -Plug 'arpanpal010/vim-read' -Plug 'AndrewRadev/splitjoin.vim' +Plug 'LnL7/vim-nix' Plug 'SirVer/ultisnips' Plug 'airblade/vim-gitgutter' Plug 'altercation/vim-colors-solarized' @@ -22,17 +20,16 @@ Plug 'junegunn/goyo.vim' Plug 'junegunn/gv.vim' Plug 'junegunn/seoul256.vim' Plug 'junegunn/vim-easy-align' -Plug 'junegunn/vim-slash' Plug 'junegunn/vim-peekaboo' +Plug 'junegunn/vim-slash' Plug 'justinmk/vim-dirvish' Plug 'justinmk/vim-sneak' Plug 'klen/python-mode' Plug 'kshenoy/vim-signature' Plug 'lervag/vimtex' -Plug 'LnL7/vim-nix' Plug 'majutsushi/tagbar' -Plug 'mhinz/vim-startify' Plug 'mhinz/vim-grepper' +Plug 'mhinz/vim-startify' Plug 'scrooloose/nerdtree' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } Plug 'terryma/vim-expand-region' @@ -44,7 +41,6 @@ Plug 'tpope/vim-dispatch' Plug 'tpope/vim-eunuch' Plug 'tpope/vim-fugitive' Plug 'tpope/vim-obsession' -Plug 'tpope/vim-projectionist' Plug 'tpope/vim-repeat' Plug 'tpope/vim-rsi' Plug 'tpope/vim-sensible' @@ -53,8 +49,10 @@ Plug 'tpope/vim-unimpaired' Plug 'troydm/zoomwintab.vim' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' -Plug 'vim-scripts/gmsh.vim' +Plug 'vim-scripts/ReplaceWithRegister' Plug 'vim-scripts/SpellCheck' +Plug 'vim-scripts/gmsh.vim' +" Plug 'w0rp/ale' if has("nvim") Plug 'Shougo/deoplete.nvim' @@ -63,7 +61,6 @@ if has("nvim") Plug 'jalvesaq/Nvim-R' else Plug 'Shougo/neocomplete.vim' - Plug 'scrooloose/syntastic' endif call plug#end() @@ -235,6 +232,7 @@ let g:tex_conceal= 'adgm' let g:tex_flavor='latex' "" Vim options +set complete+=k set smartindent set expandtab set tabstop=4 @@ -263,6 +261,9 @@ set clipboard=unnamedplus if !has("nvim") set encoding=utf-8 endif +if has("nvim") + set inccommand=split +endif "" Mappings @@ -290,7 +291,9 @@ nnoremap <LocalLeader>h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp,<CR> nnoremap Y y$ nnoremap + za nnoremap <BS> <C-W>h + nnoremap <Leader>fw :%s/\s\+$//<cr> +nnoremap <Leader>ft :%s/^ \+//g<cr> cnoremap <c-p> <up> cnoremap <c-n> <down> @@ -314,6 +317,7 @@ augroup vimrc au BufNewFile,BufRead *.pde setf freefem au BufNewFile,BufRead *.plt setf gnuplot au FileType gmsh setlocal makeprg=gmsh\ % + au FileType gmsh execute 'setlocal dict+=~/.vim/words/gmsh.txt' au FileType gnuplot setlocal makeprg=gnuplot\ % au FileType gnuplot setlocal commentstring=#%s au FileType freefem comp freefem |