update configuration

vim/UltiSnips/markdown.snippets

@@ -15,3 +15,21 @@ endsnippet
 snippet sl "Slider option"
 <!-- .slide: data-menu-title="" data-background-image="" data-transition="" -->
 endsnippet
+
+snippet imgl ""
+[![]($1)]($1){target="blank"}
+endsnippet
+
+snippet fig ""
+<figure markdown>
+  ![]($1)
+  <figcaption>$2</figcaption>
+</figure>
+endsnippet
+
+snippet figl ""
+<figure markdown>
+  [![]($1)]($1){target="blank"}
+  <figcaption>$2</figcaption>
+</figure>
+endsnippet

vim/UltiSnips/php.snippets

@@ -370,3 +370,7 @@ endsnippet
 snippet rest_class "JMS class annotation"
 * @JMS\Serializer\Annotation\ExclusionPolicy("all")
 endsnippet
+
+snippet sec "Securiy attribute"
+#[Security('is_granted("ROLE_ADMIN") or is_granted("ROLE_DPO")')]
+endsnippet

vim/UltiSnips/twig.snippets

@@ -48,3 +48,8 @@ endsnippet
 snippet set "Function"
 {% set $1 %}
 endsnippet
+
+snippet	ci "item"
+<div class="font-weight-bold">{{ '$1'|trans }}</div>
+<div class="mb-3">{{ entity.$2 }}</div>
+endsnippet

vimrc

@@ -97,6 +97,14 @@ Plugin 'ParamagicDev/vim-medic_chalk'
 Plugin 'vim-ruby/vim-ruby'
 Plugin 'Shadowsith/vim-ruby-autocomplete'
 Plugin 'autozimu/LanguageClient-neovim'
+Plugin 'joshdick/onedark.vim'
+
+Plugin 'puremourning/vimspector'
+Plugin 'MarcWeber/vim-addon-ruby-debug-ide'
+
+Plugin 'cocopon/iceberg.vim'
+
+Plugin 'voldikss/vim-floaterm'
 
 call vundle#end()
 
@@ -120,9 +128,13 @@ if has('gui_running')
     " let g:sierra_Sunset = 1
 
     let g:sierra_Pitch = 1
-    colorscheme sierra
+    " colorscheme sierra
+	" colorscheme onedark
+	colorscheme iceberg
 else
-	colorscheme Tomorrow-Night-Bright
+	" colorscheme Tomorrow-Night-Bright
+	" colorscheme onedark
+	colorscheme iceberg
 endif
 
 set background=dark
@@ -190,6 +202,15 @@ let g:UltiSnipsJumpBackwardTrigger="<c-z>"
 let g:UltiSnipsEditSplit="vertical"
 
 
+" Floaterm "
+""""""""""""
+
+let g:floaterm_keymap_toggle = '<F4>'
+let g:floaterm_keymap_new    = '<leader>t'
+let g:floaterm_keymap_prev   = '<leader>p'
+let g:floaterm_keymap_next   = '<leader>n'
+let g:floaterm_keymap_kill   = '<leader>q'
+
 " AIRLINE "
 """""""""""
 
@@ -367,7 +388,7 @@ if !exists('g:neocomplete#force_omni_input_patterns')
 	let g:neocomplete#force_omni_input_patterns = {}
 endif
 
-let g:ruby_autocomplete_solargraph = '/home/simon/.gem/ruby/2.7.0/bin/solargraph'
+let g:ruby_autocomplete_solargraph = 'solargraph'
 let g:completor_ruby_omni_trigger = '([$\w]{1,}|\.[\w]*|::[$\w]*)$'
 
 let g:acp_enableAtStartup = 0
@@ -394,8 +415,11 @@ if !exists('g:LanguageClient_serverCommands')
 	let g:LanguageClient_serverCommands.css = ['css-languageserver', '--stdio']
 	let g:LanguageClient_serverCommands.scss = ['css-languageserver', '--stdio']
 	let g:LanguageClient_serverCommands.js = ['quick-lint-js', '--stdin']
+	let g:LanguageClient_serverCommands.typescript = ['typescript-language-server', '--stdio']
+	let g:LanguageClient_serverCommands.typescriptreact = ['typescript-language-server', '--stdio']
 	let g:LanguageClient_serverCommands.go = ['gopls', 'serve']
-	let g:LanguageClient_serverCommands.ruby = ['solargraph', 'stdin']
+	let g:LanguageClient_serverCommands.ruby = ['/home/simon/bin/solargraph', 'stdio']
+	let g:LanguageClient_serverCommands.dockerfile = ['docker-langserver', '--stdio']
 endif
 
 inoremap <expr><C-g> neocomplete#undo_completion()
@@ -453,7 +477,7 @@ noremap <F11> :call PhpDoc()<CR>
 let mapleader = "_"
 
 map <F1>  :!indentation %<CR>
-map <F2>  :!php8.0 ~/php-cs-fixer.phar fix "%" --rules=@PSR2,@PhpCsFixer,@Symfony<CR>
+map <F2>  :!php8.0 ~/php-cs-fixer.phar fix "%" --rules=@PhpCsFixer<CR>
 map <F8>  :!phpmd % text /usr/share/phpmd/psr2.xml \| cut -d: -f2-<CR>
 map <c-B> :!php -l %<CR>
 map <c-s> :w<CR>
@@ -483,6 +507,15 @@ function! s:align()
   endif
 endfunction
 
+"""""""""""""""""""""""""""
+" VIM INSPECTOR
+"""""""""""""""""""""""""""
+
+"" for normal mode - the word under the cursor
+nmap <Leader>di <Plug>VimspectorBalloonEval
+" for visual mode, the visually selected text
+xmap <Leader>di <Plug>VimspectorBalloonEval
+
 """""""""""""""""""""""""""
 " UI AND EDITION
 """""""""""""""""""""""""""
@@ -498,46 +531,40 @@ set softtabstop=4
 set incsearch
 set wildmenu
 set cursorline
-set guipty
+"set guipty
 set fdc=2
 set splitbelow
 set splitright
 set hlsearch
 set nomodeline
+set clipboard=unnamedplus
 
 " set modeline
 " set guifont=Consolas\ 13
 " set guifont=Fantasque\ Sans\ Mono\ 14
 set guifont=JetBrains\ Mono\ Medium\ 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 php setlocal expandtab omnifunc=LanguageClient#complete
+autocmd FileType javascript setlocal expandtab shiftwidth=2 softtabstop=2 omnifunc=javascriptcomplete#CompleteJS
+autocmd FileType js setlocal expandtab shiftwidth=2 softtabstop=2 omnifunc=javascriptcomplete#CompleteJS
+autocmd FileType vue setlocal expandtab shiftwidth=2 softtabstop=2 omnifunc=javascriptcomplete#CompleteJS
+autocmd FileType xml setlocal expandtab omnifunc=xmlcomplete#CompleteTags
+autocmd FileType css setlocal expandtab shiftwidth=2 softtabstop=2 omnifunc=LanguageClient#complete
+autocmd FileType scss setlocal expandtab shiftwidth=2 softtabstop=2 omnifunc=LanguageClient#complete
 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 html setlocal expandtab omnifunc=htmlcomplete#CompleteTags
+autocmd FileType twig setlocal expandtab omnifunc=htmlcomplete#CompleteTags
+autocmd FileType markdown setlocal expandtab omnifunc=htmlcomplete#CompleteTags
 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
-autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
-"autocmd FileType php setlocal omnifunc=phpcomplete#CompletePHP
-autocmd FileType php setlocal omnifunc=LanguageClient#complete
-autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
-autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
-autocmd FileType js setlocal omnifunc=xmlcomplete#CompleteTags
-
+autocmd FileType python setlocal noexpandtab omnifunc=pythoncomplete#Complete
+autocmd FileType ruby setlocal omnifunc=LanguageClient#complete
+autocmd FileType go setlocal omnifunc=LanguageClient#complete
 autocmd FileType bash setlocal omnifunc=LanguageClient#complete
 autocmd FileType sh setlocal omnifunc=LanguageClient#complete
-autocmd FileType css setlocal omnifunc=LanguageClient#complete
-autocmd FileType scss setlocal omnifunc=LanguageClient#complete
-autocmd FileType go setlocal omnifunc=LanguageClient#complete
-autocmd FileType ruby setlocal omnifunc=LanguageClient#complete
+autocmd filetype typescript setlocal expandtab shiftwidth=2 softtabstop=2 tabstop=2 omnifunc=languageclient#complete
+autocmd filetype typescriptreact setlocal expandtab shiftwidth=2 softtabstop=2 tabstop=2 omnifunc=languageclient#complete
+autocmd FileType dockerfile setlocal omnifunc=LanguageClient#complete
 
 au BufRead,BufNewFile *.yaml,*.yml setfiletype yaml
 au BufRead,BufNewFile *.vue setfiletype html