7 files changed, 32 insertions, 22 deletions
diff --git a/.config/nvim/coc/coc-settings.json b/.config/nvim/coc/coc-settings.json
index f90bc38..8b56371 100644
--- a/.config/nvim/coc/coc-settings.json
+++ b/.config/nvim/coc/coc-settings.json
@@ -1,6 +1,7 @@
 {
-    "suggest.autoTrigger": "always",
-    "diagnostic.enable": true,
-		"python.linting.pycodestyleEnabled": true,
-		"html.autoCreateQuotes": false
+	"suggest.autoTrigger": "always",
+	"diagnostic.enable": true,
+	"python.linting.pycodestyleEnabled": true,
+	"html.autoCreateQuotes": false,
+	"coc.preferences.formatOnType": true
 }
diff --git a/.config/nvim/dev.vim b/.config/nvim/dev.vim
index a3b888b..149b931 100644
--- a/.config/nvim/dev.vim
+++ b/.config/nvim/dev.vim
@@ -3,6 +3,7 @@ source ~/.config/nvim/init.vim
 packadd! onedark.vim
 " packadd! fzf
 packadd! fzf.vim
+packadd! vim-jsx-pretty
 
 " --> Fzf
 source ~/.config/nvim/other/fzf.vim
@@ -36,6 +37,7 @@ nnoremap <silent><nowait> <leader>cj  :<C-u>CocNext<CR>
 nnoremap <silent><nowait> <leader>ck  :<C-u>CocPrev<CR>
 nnoremap <silent><nowait> <leader>cp  :<C-u>CocListResume<CR>
 nnoremap <leader>cm :CocList marketplace<CR>
+nnoremap <leader>cff :Format<CR>
 
 " --> Vimspector
 let g:vimspector_base_dir = expand('$HOME/.local/share/nvim/vimspector')
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 9261061..e9772ee 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -124,23 +124,26 @@ inoremap jk <Esc>
 inoremap ;n <Esc>/<++><Enter>c4l
 nnoremap <leader>n /<++><Enter>c4l
 
-autocmd FileType html,markdown,template inoremap ;s ><Esc>bi<<Esc>ea
-autocmd FileType html,markdown,template inoremap ;c ><Esc>bi</<Esc>ea
-autocmd FileType html,markdown,template inoremap ;i <Esc>b"tywi<<Esc>ea></><Esc>PF<i
-autocmd FileType html,markdown,template inoremap ;I <Esc>b"tywi<<Esc>ea><++></><Esc>P2F>i<Space>
-autocmd FileType html,markdown,template inoremap ;b <Esc>b"tywi<<Esc>ea><CR></<Esc>"tpa><CR><++><Esc>kO
-autocmd FileType html,markdown,template inoremap ;B <Esc>b"tywi<<Esc>ea><CR><++><CR></<Esc>"tpa><CR><++><Esc>3k$i<Space>
-autocmd FileType html,markdown,template inoremap ;ap <p><CR><++><CR></p><CR><++><Esc>3k$i
-autocmd FileType html,markdown,template inoremap ;aa <a href=""><CR><++><CR></a><CR><++><Esc>3k$hi
-
-autocmd FileType tex inoremap ;b <Esc>b"tywi\begin{<Esc>ea}<CR>\end{<Esc>"tpa}<Esc>kA
-autocmd FileType tex inoremap ;s \section{}<Esc>i
-autocmd FileType tex inoremap ;at \begin{tikzpicture}<CR>\end{tikzpicture}<Esc>O
-autocmd FileType tex inoremap ;ap \usepackage{}<Esc>i
-autocmd FileType tex inoremap ;aP \usepackage[]{}<Esc>F[a
-autocmd FileType tex inoremap ;ab \textbf{}<Esc>i
-autocmd FileType tex inoremap ;ai \textit{}<Esc>i
-autocmd FileType tex inoremap ;au \underline{}<Esc>i
+inoremap ;s ><Esc>bi<<Esc>ea
+inoremap ;c ><Esc>bi</<Esc>ea
+inoremap ;i <Esc>b"tywi<<Esc>ea></><Esc>PF<i
+inoremap ;I <Esc>b"tywi<<Esc>ea><++></><Esc>P2F>i<Space>
+inoremap ;b <Esc>b"tywi<<Esc>ea><CR></<Esc>"tpa><CR><++><Esc>kO
+inoremap ;B <Esc>b"tywi<<Esc>ea><CR><++><CR></<Esc>"tpa><CR><++><Esc>3k$i<Space>
+inoremap ;ap <p><CR><++><CR></p><CR><++><Esc>3k$i
+inoremap ;aa <a href=""><CR><++><CR></a><CR><++><Esc>3k$hi
+
+augroup Tex
+	autocmd!
+	autocmd FileType tex inoremap ;b <Esc>b"tywi\begin{<Esc>ea}<CR>\end{<Esc>"tpa}<Esc>kA
+	autocmd FileType tex inoremap ;s \section{}<Esc>i
+	autocmd FileType tex inoremap ;at \begin{tikzpicture}<CR>\end{tikzpicture}<Esc>O
+	autocmd FileType tex inoremap ;ap \usepackage{}<Esc>i
+	autocmd FileType tex inoremap ;aP \usepackage[]{}<Esc>F[a
+	autocmd FileType tex inoremap ;ab \textbf{}<Esc>i
+	autocmd FileType tex inoremap ;ai \textit{}<Esc>i
+	autocmd FileType tex inoremap ;au \underline{}<Esc>i
+augroup END
 
 autocmd FileType go inoremap ;ae err<Space>:=<Space><++><CR>if<Space>err<Space>!=<Space>nil<Space>{<CR>return<Space>err<CR>}<Esc>3kI
 
@@ -169,7 +172,10 @@ autocmd BufEnter vartak-results-data.pl nmap <leader>t :w<CR>:se nornu<CR>:!vart
 
 nnoremap <leader>w :set wrap!<CR>
 nnoremap <leader>fo :!opout "%:p"<CR>
-nnoremap <leader>ec :tabnew ~/.config/nvim/init.vim<CR>
+nnoremap <leader>ei :tabnew ~/.config/nvim/init.vim<CR>
+nnoremap <leader>eo :tabnew ~/.config/nvim/coc/coc-onload.vim<CR>
+nnoremap <leader>ec :tabnew ~/.config/nvim/coc/coc-settings.json<CR>
+nnoremap <leader>ed :tabnew ~/.config/nvim/dev.vim<CR>
 nnoremap <leader><C-r> :source ~/.config/nvim/init.vim<CR>
 nnoremap <leader>s :%s//gc<Left><Left><Left>
 
@@ -179,3 +185,4 @@ let shortcuts = config_dir . "shortcuts.vim"
 if filereadable(shortcuts)
 	execute "source " . shortcuts
 endif
+
diff --git a/.config/nvim/pack/plugins/opt/vim-javascript b/.config/nvim/pack/plugins/opt/vim-javascript
new file mode 160000
+Subproject b26c9edb3563e02f5c0b20580f7cf9743e95b15
diff --git a/.config/nvim/pack/plugins/opt/vim-jsx b/.config/nvim/pack/plugins/opt/vim-jsx
new file mode 160000
+Subproject 8879e0d9c5ba0e04ecbede1c89f63b7a0efa24a
diff --git a/.config/nvim/pack/plugins/opt/vim-jsx-improve b/.config/nvim/pack/plugins/opt/vim-jsx-improve
new file mode 160000
+Subproject b179bf9a3901ccc6afcaa3abc9c93bae450f333
diff --git a/.config/nvim/pack/plugins/opt/vim-jsx-pretty b/.config/nvim/pack/plugins/opt/vim-jsx-pretty
new file mode 160000
+Subproject 6989f1663cc03d7da72b5ef1c03f87e6ddb70b4