From 5f3a75d94fb51dfb0c8eb51967dfebc0fa688ba8 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 28 Mar 2019 13:18:31 +0100 Subject: [PATCH] update vimrc --- vimrc | 73 +++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 61 insertions(+), 12 deletions(-) diff --git a/vimrc b/vimrc index d12153a..d4c7245 100644 --- a/vimrc +++ b/vimrc @@ -34,7 +34,6 @@ Plugin 'tobyS/vmustache.git' Plugin 'sjl/gundo.vim.git' Plugin 'godlygeek/tabular.git' Plugin 'tpope/vim-fugitive.git' -Plugin 'airblade/vim-gitgutter.git' Plugin 'groenewege/vim-less.git' Plugin 'arnaud-lb/vim-php-namespace.git' Plugin 'tpope/vim-surround.git' @@ -61,12 +60,29 @@ Plugin 'evandotpro/nerdtree-chmod' Plugin 'shawncplus/phpcomplete.vim' Plugin 'bronson/vim-trailing-whitespace' Plugin 'jacoborus/tender' -Plugin 'vexxor/phpdoc.vim' +" Plugin 'vexxor/phpdoc.vim' +Plugin 'Rican7/php-doc-modded' Plugin 'mzlogin/vim-markdown-toc' Plugin 'rosenfeld/conque-term' -Plugin 'joonty/vdebug' +" Plugin 'joonty/vdebug' Plugin 'isRuslan/vim-es6' Plugin 'suan/vim-instant-markdown' +Plugin 'dracula/vim' +Plugin 'sniphpets/sniphpets-doctrine' +Plugin 'sniphpets/sniphpets' +Plugin 'jaxbot/semantic-highlight.vim' +Plugin 'thaerkh/vim-indentguides' +Plugin 'PotatoesMaster/i3-vim-syntax' +Plugin 'fatih/vim-go' +Plugin 'mhinz/vim-signify' +Plugin 'andrewradev/splitjoin.vim' +Plugin 'wahidrahim/resize-font' +Plugin 'skywind3000/asyncrun.vim' +Plugin 'valloric/listtoggle' +Plugin 'c9s/phpunit.vim' +Plugin 'terryma/vim-multiple-cursors' +Plugin 'dkarter/bullets.vim' +Plugin 'connorholyday/vim-snazzy' call vundle#end() @@ -77,7 +93,9 @@ call vundle#end() syntax on if has('gui_running') - colorscheme tender + " colorscheme tender + " colorscheme dracula + colorscheme snazzy else colorscheme Tomorrow-Night-Bright endif @@ -97,6 +115,13 @@ set completeopt-=preview " PLUGINS CONFIGURATION """"""""""""""""""""""""""" +" SEMANTIC " +"""""""""""" + +if has('gui_running') + let g:semanticEnableFileTypes = { 'javascript': 'js', 'vim': 'vim', 'php': 'php'} +endif + " PHP-CS-FIXER " """""""""""""""" @@ -118,7 +143,10 @@ let g:NERDTreeIndicatorMapCustom = { " Markdown preview " """""""""""""""""""" - +let g:vim_markdown_auto_insert_bullets = 1 +let g:vim_markdown_follow_anchor = 1 +let g:vim_markdown_autowrite = 0 +let g:vim_markdown_conceal = 0 let g:instant_markdown_autostart = 0 " COLORIZER " @@ -138,6 +166,7 @@ let g:UltiSnipsJumpForwardTrigger="" let g:UltiSnipsJumpBackwardTrigger="" let g:UltiSnipsEditSplit="vertical" + " AIRLINE " """"""""""" @@ -200,6 +229,15 @@ command! Sfservices CtrlPSymfonyServices command! Sfservicesdefinition CtrlPSymfonyServiceDefinition command! Sfforms CtrlPSymfonyForms +" PHP-CS-FIXER " +"""""""""""""""" + +let g:php_cs_fixer_php_path = "/usr/bin/php7.1" + +" CTAGS " +""""""""" + +command! CT AsyncRun ctags **/*.php " EMMET " """"""""" @@ -361,6 +399,7 @@ noremap :call PhpDoc() " set keywordprg=pman let mapleader = "_" + map :!indentation % map :call PhpCsFixerFixFile() map :!phpmd % text /usr/share/phpmd/psr2.xml \| cut -d: -f2- @@ -368,13 +407,16 @@ map :!php -l % map :w map :call PhpInsertUse() -vmap cc :s/_\([a-z]\)/\U\1/g -vmap sc :s/\([A-Z]\)/_\L\1/g +vmap cc :s/\%V_\([a-z]\)/\U\1/g +vmap sc :s/\%V\([A-Z]\)/_\L\1/g vmap lc sc -nmap cc viwcc -nmap sc viwsc -nmap lc viwsc + +nmap cc vawcc +nmap sc vawsc +nmap lc vawsc nmap inso +nmap :ResizeFontSmaller +nmap :ResizeFontBigger inoremap :call align()a @@ -396,6 +438,7 @@ endfunction set mouse=a set autoindent set nu +set rnu set showmatch set tabstop=4 set shiftwidth=4 @@ -408,6 +451,7 @@ set fdc=2 set splitbelow set splitright set hlsearch +set modeline " set guifont=Consolas\ 13 set guifont=Fantasque\ Sans\ Mono\ 14 @@ -415,11 +459,14 @@ autocmd FileType php setlocal expandtab autocmd FileType javascript setlocal expandtab autocmd FileType xml setlocal expandtab autocmd FileType css setlocal expandtab +autocmd FileType scss setlocal expandtab +autocmd FileType go setlocal expandtab autocmd FileType coffee setlocal expandtab autocmd FileType ts setlocal expandtab autocmd FileType html setlocal expandtab autocmd FileType twig setlocal expandtab autocmd FileType json setlocal expandtab +autocmd FileType python setlocal noexpandtab autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags @@ -428,5 +475,7 @@ autocmd FileType php setlocal omnifunc=phpcomplete#CompletePHP autocmd FileType python setlocal omnifunc=pythoncomplete#Complete autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags -au BufNewFile,BufRead *.yaml,*.yml setfiletype yaml -au BufRead,BufNewFile *.twig setfiletype twig +au BufRead,BufNewFile *.yaml,*.yml setfiletype yaml +au BufRead,BufNewFile *.vue setfiletype html +au BufRead,BufNewFile *.html.twig,*.twig setfiletype twig +au BufRead,BufNewFile *.js setfiletype js