diff --git a/vimrc b/vimrc index db318da..07d7a45 100644 --- a/vimrc +++ b/vimrc @@ -13,6 +13,8 @@ endif let g:SuperTabDefaultCompletionType = "" +let g:polyglot_disabled = ['markdown'] + set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() @@ -83,7 +85,11 @@ Plugin 'c9s/phpunit.vim' Plugin 'terryma/vim-multiple-cursors' Plugin 'dkarter/bullets.vim' Plugin 'connorholyday/vim-snazzy' +Plugin 'bluz71/vim-moonfly-colors' +Plugin 'glepnir/oceanic-material' " Plugin 'patstockwell/vim-monokai-tasty' +Plugin 'AlessandroYorba/Sierra' +Plugin 'junegunn/fzf' call vundle#end() @@ -97,7 +103,16 @@ if has('gui_running') " colorscheme tender " colorscheme dracula " colorscheme vim-monokai-tasty - colorscheme snazzy + " colorscheme moonfly + " set background=dark + " colorscheme oceanic_material + " colorscheme snazzy + + " let g:sierra_Midnight = 1 + " let g:sierra_Twilight = 1 + " let g:sierra_Sunset = 1 + let g:sierra_Pitch = 1 + colorscheme sierra else colorscheme Tomorrow-Night-Bright endif @@ -126,7 +141,7 @@ endif " NERDTREE-GIT " """""""""""""""" -let g:NERDTreeIndicatorMapCustom = { +let g:NERDTreeGitStatusIndicatorMapCustom = { \ 'Modified' : 'M', \ 'Staged' : 'S', \ 'Untracked' : '?', @@ -146,8 +161,6 @@ let g:vim_markdown_autowrite = 0 let g:vim_markdown_conceal = 0 let g:instant_markdown_autostart = 0 -let g:polyglot_disabled = ['markdown'] - " COLORIZER " """"""""""""" @@ -232,8 +245,8 @@ command! Sfforms CtrlPSymfonyForms " PHP-CS-FIXER " """""""""""""""" -let g:php_cs_fixer_level = '' -let g:php_cs_fixer_php_path = "/usr/bin/php7.3" +" let g:php_cs_fixer_level = '' +" let g:php_cs_fixer_php_path = "/usr/bin/php7.3" " CTAGS " """"""""" @@ -411,7 +424,7 @@ noremap :call PhpDoc() let mapleader = "_" map :!indentation % -map :!php7.3 ~/php-cs-fixer.phar fix "%" --rules=@PSR2 +map :!php7.3 ~/php-cs-fixer.phar fix "%" --rules=@PSR2,@PhpCsFixer,@Symfony map :!phpmd % text /usr/share/phpmd/psr2.xml \| cut -d: -f2- map :!php -l % map :w