Merge vim and neovim configs

30 files changed, 205 insertions, 1473 deletions

diff --git a/.gitignore b/.gitignore
index 7497ca7..2bbf648 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,14 +5,12 @@ mutt/mailboxes/
 mutt/mutt-colors-solarized/
 mutt/temp/
 newsbeuter
-nvim/netrwhist
-nvim/autoload/
-nvim/plugged/
-nvim/vim-plug/
-nvim/vimundo/
+vim/netrwhist
+vim/autoload/
+vim/plugged/
+vim/vim-plug/
+vim/vimundo/
 vifm/Trash
 vifm/vifminfo
 vifm/vimfiles
-vim/bundle/
-vim/vimundo/*
 nvim/.netrwhist
diff --git a/nvim b/nvim
new file mode 120000
index 0000000..7923f59
--- /dev/null
+++ b/nvim
@@ -0,0 +1 @@
+vim
\ No newline at end of file
diff --git a/nvim/after/ftplugin/tex/folding.vim b/nvim/after/ftplugin/tex/folding.vim
deleted file mode 100644
index e69de29..0000000
--- a/nvim/after/ftplugin/tex/folding.vim
+++ /dev/null
diff --git a/nvim/after/ftplugin/tex/mappings.vim b/nvim/after/ftplugin/tex/mappings.vim
deleted file mode 100644
index e7dd610..0000000
--- a/nvim/after/ftplugin/tex/mappings.vim
+++ /dev/null
@@ -1,59 +0,0 @@
-inoremap <buffer> (( \left(
-inoremap <buffer> )) \right)
-inoremap <buffer> {{ \left\{
-inoremap <buffer> }} \right\}
-inoremap <buffer> [[ \left[
-inoremap <buffer> ]] \right]
-inoremap <buffer> == \,=\,
-inoremap <buffer> >> \,\geq\,
-inoremap <buffer> << \,\leq\,
-inoremap <buffer> ++ \,+\,
-inoremap <buffer> -- \,-\,
-
-iabbrev <buffer> ga \alpha
-iabbrev <buffer> gb \beta
-iabbrev <buffer> gg \gamma
-iabbrev <buffer> gd \delta
-iabbrev <buffer> ge \varepsilon
-iabbrev <buffer> gz \zeta
-iabbrev <buffer> gh \eta
-iabbrev <buffer> gt \theta
-iabbrev <buffer> gi \iota
-iabbrev <buffer> gk \kappa
-iabbrev <buffer> gl \lambda
-iabbrev <buffer> gm \mu
-iabbrev <buffer> gn \nu
-iabbrev <buffer> gx \xi
-iabbrev <buffer> gr \rho
-iabbrev <buffer> gs \sigma
-iabbrev <buffer> gf \phi
-iabbrev <buffer> gp \pi
-iabbrev <buffer> gw \omega
-iabbrev <buffer> dd \d
-
-" function! SynctexShow()
-"     let synctex = glob("*.synctex.gz")
-"     if strlen(synctex) == 0
-"         echom "no synctex file found"
-"     else
-"         let pdffile = substitute(synctex,"synctex.gz","pdf","")
-"         let execline = printf(":!zathura --synctex-forward %d:%d:%s %s", line('.'), col('.'), shellescape(bufname("%")), shellescape(pdffile))
-"         exec execline
-"     end
-" endfunction
-
-" nnoremap <buffer> <LocalLeader>a :call SynctexShow()<CR><CR>
-" nnoremap <buffer> <LocalLeader>i :Latexmk<CR>
-" nnoremap <buffer> <LocalLeader>e :LatexErrors<CR>
-" nnoremap <buffer> <LocalLeader>o :LatexView<CR>
-" noremap  <buffer> <LocalLeader>k :LatexmkStop<CR>:LatexmkClean<CR>
-" nnoremap <buffer> <LocalLeader>h :split header.sty<CR>
-
-
-nnoremap <buffer> <LocalLeader>i :VimtexCompile<CR>
-nnoremap <buffer> <LocalLeader>e :VimtexErrors<CR>
-nnoremap <buffer> <LocalLeader>o :VimtexView<CR>
-nnoremap <buffer> <LocalLeader>k :VimtexStop<CR>:VimtexClean<CR>
-nnoremap <buffer> <LocalLeader>t :VimtexTocToggle<CR>
-nnoremap <buffer> <LocalLeader>h :split header.sty<CR>
-nnoremap <buffer> <LocalLeader>h :split header.sty<CR>
diff --git a/nvim/after/ftplugin/tex/unilatex.vim b/nvim/after/ftplugin/tex/unilatex.vim
deleted file mode 100644
index 69358fc..0000000
--- a/nvim/after/ftplugin/tex/unilatex.vim
+++ /dev/null
@@ -1,675 +0,0 @@
-function! UTF8toLaTeX()
-    " store cursor position
-    let s:line = line(".")
-    let s:column = col(".")
-    silent %s/α/\\alpha/eg
-    silent %s/β/\\beta/eg
-    silent %s/γ/\\gamma/eg
-    silent %s/δ/\\delta/eg
-    silent %s/∊/\\epsilon/eg
-    silent %s/ε/\\varepsilon/eg
-    silent %s/ζ/\\zeta/eg
-    silent %s/η/\\eta/eg
-    silent %s/θ/\\theta/eg
-    silent %s/ϑ/\\vartheta/eg
-    silent %s/ι/\\iota/eg
-    silent %s/κ/\\kappa/eg
-    silent %s/λ/\\lambda/eg
-    silent %s/μ/\\mu/eg
-    silent %s/ν/\\nu/eg
-    silent %s/ξ/\\xi/eg
-    silent %s/π/\\pi/eg
-    silent %s/ϖ/\\varpi/eg
-    silent %s/ρ/\\rho/eg
-    silent %s/ϱ/\\varrho/eg
-    silent %s/σ/\\sigma/eg
-    silent %s/ς/\\varsigma/eg
-    silent %s/τ/\\tau/eg
-    silent %s/υ/\\upsilon/eg
-    silent %s/φ/\\phi/eg
-    silent %s/ϕ/\\varphi/eg
-    silent %s/χ/\\chi/eg
-    silent %s/ψ/\\psi/eg
-    silent %s/ω/\\omega/eg
-    silent %s/Γ/\\Gamma/eg
-    silent %s/Δ/\\Delta/eg
-    silent %s/Θ/\\Theta/eg
-    silent %s/Λ/\\Lambda/eg
-    silent %s/Ξ/\\Xi/eg
-    silent %s/Π/\\Pi/eg
-    silent %s/Υ/\\Upsilon/eg
-    silent %s/Φ/\\Phi/eg
-    silent %s/Ψ/\\Psi/eg
-    silent %s/Ω/\\Omega/eg
-    silent %s/≤/\\leq/eg
-    silent %s/≪/\\ll/eg
-    silent %s/≺/\\prec/eg
-    silent %s/≼/\\preceq/eg
-    silent %s/⊂/\\subset/eg
-    silent %s/⊆/\\subseteq/eg
-    silent %s/⊏/\\sqsubset/eg
-    silent %s/⊑/\\sqsubseteq/eg
-    silent %s/∈/\\in/eg
-    silent %s/⊢/\\vdash/eg
-    silent %s/∣/\\mid/eg
-    silent %s/⌣/\\smile/eg
-    silent %s/≥/\\geq/eg
-    silent %s/≫/\\gg/eg
-    silent %s/≻/\\succ/eg
-    silent %s/≽/\\succeq/eg
-    silent %s/⊃/\\supset/eg
-    silent %s/⊇/\\supseteq/eg
-    silent %s/⊐/\\sqsupset/eg
-    silent %s/⊒/\\sqsupseteq/eg
-    silent %s/∋/\\ni/eg
-    silent %s/⊣/\\dashv/eg
-    silent %s/∥/\\parallel/eg
-    silent %s/⌢/\\frown/eg
-    silent %s/∉/\\notin/eg
-    silent %s/≡/\\equiv/eg
-    silent %s/≐/\\doteq/eg
-    silent %s/∼/\\sim/eg
-    silent %s/≃/\\simeq/eg
-    silent %s/≈/\\approx/eg
-    silent %s/≅/\\cong/eg
-    silent %s/⋈/\\Join/eg
-    silent %s/⋈/\\bowtie/eg
-    silent %s/∝/\\propto/eg
-    silent %s/⊨/\\models/eg
-    silent %s/⊥/\\perp/eg
-    silent %s/≍/\\asymp/eg
-    silent %s/≠/\\neq/eg
-    silent %s/±/\\pm/eg
-    silent %s/⋅/\\cdot/eg
-    silent %s/×/\\times/eg
-    silent %s/∪/\\cup/eg
-    silent %s/⊔/\\sqcup/eg
-    silent %s/∨/\\vee/eg
-    silent %s/⊕/\\oplus/eg
-    silent %s/⊙/\\odot/eg
-    silent %s/⊗/\\otimes/eg
-    silent %s/△/\\bigtriangleup/eg
-    silent %s/⊲/\\lhd/eg
-    silent %s/⊴/\\unlhd/eg
-    silent %s/∓/\\mp/eg
-    silent %s/÷/\\div/eg
-    silent %s/∖/\\setminus/eg
-    silent %s/∩/\\cap/eg
-    silent %s/⊓/\\sqcap/eg
-    silent %s/∧/\\wedge/eg
-    silent %s/⊖/\\ominus/eg
-    silent %s/⊘/\\oslash/eg
-    silent %s/○/\\bigcirc/eg
-    silent %s/▽/\\bigtriangledown/eg
-    silent %s/⊳/\\rhd/eg
-    silent %s/⊵/\\unrhd/eg
-    silent %s/◁/\\triangleleft/eg
-    silent %s/▷/\\triangleright/eg
-    silent %s/⋆/\\star/eg
-    silent %s/∗/\\ast/eg
-    silent %s/∘/\\circ/eg
-    silent %s/∙/\\bullet/eg
-    silent %s/⋄/\\diamond/eg
-    silent %s/⊎/\\uplus/eg
-    silent %s/†/\\dagger/eg
-    silent %s/‡/\\ddagger/eg
-    silent %s/≀/\\wr/eg
-    silent %s/∑/\\sum/eg
-    silent %s/∏/\\prod/eg
-    silent %s/∐/\\coprod/eg
-    silent %s/∫/\\int/eg
-    silent %s/⋃/\\bigcup/eg
-    silent %s/⋂/\\bigcap/eg
-    silent %s/⊔/\\bigsqcup/eg
-    silent %s/∮/\\oint/eg
-    silent %s/⋁/\\bigvee/eg
-    silent %s/⋀/\\bigwedge/eg
-    silent %s/⊕/\\bigoplus/eg
-    silent %s/⊗/\\bigotimes/eg
-    silent %s/⊙/\\bigodot/eg
-    silent %s/⊎/\\biguplus/eg
-    silent %s/←/\\leftarrow/eg
-    silent %s/→/\\rightarrow/eg
-    silent %s/↔/\\leftrightarrow/eg
-    silent %s/⇐/\\Leftarrow/eg
-    silent %s/⇒/\\Rightarrow/eg
-    silent %s/⇔/\\Leftrightarrow/eg
-    silent %s/↦/\\mapsto/eg
-    silent %s/↩/\\hookleftarrow/eg
-    silent %s/↼/\\leftharpoonup/eg
-    silent %s/↽/\\leftharpoondown/eg
-    silent %s/↪/\\hookrightarrow/eg
-    silent %s/⇀/\\rightharpoonup/eg
-    silent %s/⇁/\\rightharpoondown/eg
-    silent %s/←/\\longleftarrow/eg
-    silent %s/→/\\longrightarrow/eg
-    silent %s/↔/\\longleftrightarrow/eg
-    silent %s/⇐/\\Longleftarrow/eg
-    silent %s/⇒/\\Longrightarrow/eg
-    silent %s/⇔/\\Longleftrightarrow/eg
-    silent %s/⇖/\\longmapsto/eg
-    silent %s/↑/\\uparrow/eg
-    silent %s/↓/\\downarrow/eg
-    silent %s/↕/\\updownarrow/eg
-    silent %s/⇑/\\Uparrow/eg
-    silent %s/⇓/\\Downarrow/eg
-    silent %s/⇕/\\Updownarrow/eg
-    silent %s/↗/\\nearrow/eg
-    silent %s/↘/\\searrow/eg
-    silent %s/↙/\\swarrow/eg
-    silent %s/↖/\\nwarrow/eg
-    silent %s/↝/\\leadsto/eg
-    silent %s/…/\\dots/eg
-    silent %s/⋯/\\cdots/eg
-    silent %s/⋮/\\vdots/eg
-    silent %s/⋱/\\ddots/eg
-    silent %s/ℏ/\\hbar/eg
-    silent %s/ℓ/\\ell/eg
-    silent %s/ℜ/\\Re/eg
-    silent %s/ℑ/\\Im/eg
-    silent %s/א/\\aleph/eg
-    silent %s/℘/\\wp/eg
-    silent %s/∀/\\forall/eg
-    silent %s/∃/\\exists/eg
-    silent %s/℧/\\mho/eg
-    silent %s/∂/\\partial/eg
-    silent %s/′/\\prime/eg
-    silent %s/∅/\\emptyset/eg
-    silent %s/∞/\\infty/eg
-    silent %s/∇/\\nabla/eg
-    silent %s/△/\\triangle/eg
-    silent %s/□/\\Box/eg
-    silent %s/◇/\\Diamond/eg
-    silent %s/⊥/\\bot/eg
-    silent %s/⊤/\\top/eg
-    silent %s/∠/\\angle/eg
-    silent %s/√/\\surd/eg
-    silent %s/♢/\\diamondsuit/eg
-    silent %s/♡/\\heartsuit/eg
-    silent %s/♣/\\clubsuit/eg
-    silent %s/♠/\\spadesuit/eg
-    silent %s/¬/\\neg/eg
-    silent %s/♭/\\flat/eg
-    silent %s/♮/\\natural/eg
-    silent %s/♯/\\sharp/eg
-    silent %s/Ϝ/\\digamma/eg
-    silent %s/ϰ/\\varkappa/eg
-    silent %s/ב/\\beth/eg
-    silent %s/ד/\\daleth/eg
-    silent %s/ג/\\gimel/eg
-    silent %s/⋖/\\lessdot/eg
-    silent %s/≤/\\leqslant/eg
-    silent %s/≦/\\leqq/eg
-    silent %s/⋘/\\lll/eg
-    silent %s/≲/\\lesssim/eg
-    silent %s/≶/\\lessgtr/eg
-    silent %s/⋚/\\lesseqgtr/eg
-    silent %s/≼/\\preccurlyeq/eg
-    silent %s/⋞/\\curlyeqprec/eg
-    silent %s/≾/\\precsim/eg
-    silent %s/⋐/\\Subset/eg
-    silent %s/⊏/\\sqsubset/eg
-    silent %s/∴/\\therefore/eg
-    silent %s/⌣/\\smallsmile/eg
-    silent %s/⊲/\\vartriangleleft/eg
-    silent %s/⊴/\\trianglelefteq/eg
-    silent %s/⋗/\\gtrdot/eg
-    silent %s/≧/\\geqq/eg
-    silent %s/⋙/\\ggg/eg
-    silent %s/≳/\\gtrsim/eg
-    silent %s/≷/\\gtrless/eg
-    silent %s/⋛/\\gtreqless/eg
-    silent %s/≽/\\succcurlyeq/eg
-    silent %s/⋟/\\curlyeqsucc/eg
-    silent %s/≿/\\succsim/eg
-    silent %s/⋑/\\Supset/eg
-    silent %s/⊐/\\sqsupset/eg
-    silent %s/∵/\\because/eg
-    silent %s/∥/\\shortparallel/eg
-    silent %s/⌢/\\smallfrown/eg
-    silent %s/⊳/\\vartriangleright/eg
-    silent %s/⊵/\\trianglerighteq/eg
-    silent %s/≑/\\doteqdot/eg
-    silent %s/≓/\\risingdotseq/eg
-    silent %s/≒/\\fallingdotseq/eg
-    silent %s/≖/\\eqcirc/eg
-    silent %s/≗/\\circeq/eg
-    silent %s/≜/\\triangleq/eg
-    silent %s/≏/\\bumpeq/eg
-    silent %s/≎/\\Bumpeq/eg
-    silent %s/∼/\\thicksim/eg
-    silent %s/≈/\\thickapprox/eg
-    silent %s/≊/\\approxeq/eg
-    silent %s/∽/\\backsim/eg
-    silent %s/⊨/\\vDash/eg
-    silent %s/⊩/\\Vdash/eg
-    silent %s/⊪/\\Vvdash/eg
-    silent %s/∍/\\backepsilon/eg
-    silent %s/∝/\\varpropto/eg
-    silent %s/≬/\\between/eg
-    silent %s/⋔/\\pitchfork/eg
-    silent %s/◀/\\blacktriangleleft/eg
-    silent %s/▷/\\blacktriangleright/eg
-    silent %s/⇠/\\dashleftarrow/eg
-    silent %s/⇇/\\leftleftarrows/eg
-    silent %s/⇆/\\leftrightarrows/eg
-    silent %s/⇚/\\Lleftarrow/eg
-    silent %s/↞/\\twoheadleftarrow/eg
-    silent %s/↢/\\leftarrowtail/eg
-    silent %s/⇋/\\leftrightharpoons/eg
-    silent %s/↰/\\Lsh/eg
-    silent %s/↫/\\looparrowleft/eg
-    silent %s/↶/\\curvearrowleft/eg
-    silent %s/↺/\\circlearrowleft/eg
-    silent %s/⇢/\\dashrightarrow/eg
-    silent %s/⇉/\\rightrightarrows/eg
-    silent %s/⇄/\\rightleftarrows/eg
-    silent %s/⇛/\\Rrightarrow/eg
-    silent %s/↠/\\twoheadrightarrow/eg
-    silent %s/↣/\\rightarrowtail/eg
-    silent %s/⇌/\\rightleftharpoons/eg
-    silent %s/↱/\\Rsh/eg
-    silent %s/↬/\\looparrowright/eg
-    silent %s/↷/\\curvearrowright/eg
-    silent %s/↻/\\circlearrowright/eg
-    silent %s/⊸/\\multimap/eg
-    silent %s/⇈/\\upuparrows/eg
-    silent %s/⇊/\\downdownarrows/eg
-    silent %s/↿/\\upharpoonleft/eg
-    silent %s/↾/\\upharpoonright/eg
-    silent %s/⇃/\\downharpoonleft/eg
-    silent %s/⇂/\\downharpoonright/eg
-    silent %s/⇝/\\rightsquigarrow/eg
-    silent %s/↭/\\leftrightsquigarrow/eg
-    silent %s/∔/\\dotplus/eg
-    silent %s/⋉/\\ltimes/eg
-    silent %s/⋓/\\Cup/eg
-    silent %s/⊻/\\veebar/eg
-    silent %s/⊞/\\boxplus/eg
-    silent %s/⊠/\\boxtimes/eg
-    silent %s/⋋/\\leftthreetimes/eg
-    silent %s/⋎/\\curlyvee/eg
-    silent %s/⋅/\\centerdot/eg
-    silent %s/⋈/\\rtimes/eg
-    silent %s/⋒/\\Cap/eg
-    silent %s/⊼/\\barwedge/eg
-    silent %s/⊟/\\boxminus/eg
-    silent %s/⊡/\\boxdot/eg
-    silent %s/⋌/\\rightthreetimes/eg
-    silent %s/⋏/\\curlywedge/eg
-    silent %s/⊺/\\intercal/eg
-    silent %s/⋇/\\divideontimes/eg
-    silent %s/∖/\\smallsetminus/eg
-    silent %s/⊝/\\circleddash/eg
-    silent %s/⊚/\\circledcirc/eg
-    silent %s/⊛/\\circledast/eg
-    silent %s/ℏ/\\hbar/eg
-    silent %s/ℏ/\\hslash/eg
-    silent %s/□/\\square/eg
-    silent %s/■/\\blacksquare/eg
-    silent %s/Ⓢ/\\circledS/eg
-    silent %s/△/\\vartriangle/eg
-    silent %s/▲/\\blacktriangle/eg
-    silent %s/∁/\\complement/eg
-    silent %s/▽/\\triangledown/eg
-    silent %s/▼/\\blacktriangledown/eg
-    silent %s/◊/\\lozenge/eg
-    silent %s/◆/\\blacklozenge/eg
-    silent %s/★/\\bigstar/eg
-    silent %s/∠/\\angle/eg
-    silent %s/∡/\\measuredangle/eg
-    silent %s/∢/\\sphericalangle/eg
-    silent %s/‵/\\backprime/eg
-    silent %s/∄/\\nexists/eg
-    silent %s/Ⅎ/\\Finv/eg
-    silent %s/∅/\\varnothing/eg
-    silent %s/ð/\\eth/eg
-    silent %s/℧/\\mho/eg
-
-    call cursor(s:line,s:column)
-endfunction
-
-function! LaTeXtoUTF8()
-    let s:line = line(".")
-    let s:column = col(".")
-
-    let s:oldencoding = &l:fileencoding
-    set fileencoding=utf-8
-
-    " convert latex commands to unicode
-    silent %s/\\alpha\>/α/eg
-    silent %s/\\beta\>/β/eg
-    silent %s/\\gamma\>/γ/eg
-    silent %s/\\delta\>/δ/eg
-    silent %s/\\epsilon\>/∊/eg
-    silent %s/\\varepsilon\>/ε/eg
-    silent %s/\\zeta\>/ζ/eg
-    silent %s/\\eta\>/η/eg
-    silent %s/\\theta\>/θ/eg
-    silent %s/\\vartheta\>/ϑ/eg
-    silent %s/\\iota\>/ι/eg
-    silent %s/\\kappa\>/κ/eg
-    silent %s/\\lambda\>/λ/eg
-    silent %s/\\mu\>/μ/eg
-    silent %s/\\nu\>/ν/eg
-    silent %s/\\xi\>/ξ/eg
-    silent %s/\\pi\>/π/eg
-    silent %s/\\varpi\>/ϖ/eg
-    silent %s/\\rho\>/ρ/eg
-    silent %s/\\varrho\>/ϱ/eg
-    silent %s/\\sigma\>/σ/eg
-    silent %s/\\varsigma\>/ς/eg
-    silent %s/\\tau\>/τ/eg
-    silent %s/\\upsilon\>/υ/eg
-    silent %s/\\phi\>/φ/eg
-    silent %s/\\varphi\>/ϕ/eg
-    silent %s/\\chi\>/χ/eg
-    silent %s/\\psi\>/ψ/eg
-    silent %s/\\omega\>/ω/eg
-    silent %s/\\Gamma\>/Γ/eg
-    silent %s/\\Delta\>/Δ/eg
-    silent %s/\\Theta\>/Θ/eg
-    silent %s/\\Lambda\>/Λ/eg
-    silent %s/\\Xi\>/Ξ/eg
-    silent %s/\\Pi\>/Π/eg
-    silent %s/\\Upsilon\>/Υ/eg
-    silent %s/\\Phi\>/Φ/eg
-    silent %s/\\Psi\>/Ψ/eg
-    silent %s/\\Omega\>/Ω/eg
-    silent %s/\\leq\>/≤/eg
-    silent %s/\\ll\>/≪/eg
-    silent %s/\\prec\>/≺/eg
-    silent %s/\\preceq\>/≼/eg
-    silent %s/\\subset\>/⊂/eg
-    silent %s/\\subseteq\>/⊆/eg
-    silent %s/\\sqsubset\>/⊏/eg
-    silent %s/\\sqsubseteq\>/⊑/eg
-    silent %s/\\in\>/∈/eg
-    silent %s/\\vdash\>/⊢/eg
-    silent %s/\\mid\>/∣/eg
-    silent %s/\\smile\>/⌣/eg
-    silent %s/\\geq\>/≥/eg
-    silent %s/\\gg\>/≫/eg
-    silent %s/\\succ\>/≻/eg
-    silent %s/\\succeq\>/≽/eg
-    silent %s/\\supset\>/⊃/eg
-    silent %s/\\supseteq\>/⊇/eg
-    silent %s/\\sqsupset\>/⊐/eg
-    silent %s/\\sqsupseteq\>/⊒/eg
-    silent %s/\\ni\>/∋/eg
-    silent %s/\\dashv\>/⊣/eg
-    silent %s/\\parallel\>/∥/eg
-    silent %s/\\frown\>/⌢/eg
-    silent %s/\\notin\>/∉/eg
-    silent %s/\\equiv\>/≡/eg
-    silent %s/\\doteq\>/≐/eg
-    silent %s/\\sim\>/∼/eg
-    silent %s/\\simeq\>/≃/eg
-    silent %s/\\approx\>/≈/eg
-    silent %s/\\cong\>/≅/eg
-    silent %s/\\Join\>/⋈/eg
-    silent %s/\\bowtie\>/⋈/eg
-    silent %s/\\propto\>/∝/eg
-    silent %s/\\models\>/⊨/eg
-    silent %s/\\perp\>/⊥/eg
-    silent %s/\\asymp\>/≍/eg
-    silent %s/\\neq\>/≠/eg
-    silent %s/\\pm\>/±/eg
-    silent %s/\\cdot\>/⋅/eg
-    silent %s/\\times\>/×/eg
-    silent %s/\\cup\>/∪/eg
-    silent %s/\\sqcup\>/⊔/eg
-    silent %s/\\vee\>/∨/eg
-    silent %s/\\oplus\>/⊕/eg
-    silent %s/\\odot\>/⊙/eg
-    silent %s/\\otimes\>/⊗/eg
-    silent %s/\\bigtriangleup\>/△/eg
-    silent %s/\\lhd\>/⊲/eg
-    silent %s/\\unlhd\>/⊴/eg
-    silent %s/\\mp\>/∓/eg
-    silent %s/\\div\>/÷/eg
-    silent %s/\\setminus\>/∖/eg
-    silent %s/\\cap\>/∩/eg
-    silent %s/\\sqcap\>/⊓/eg
-    silent %s/\\wedge\>/∧/eg
-    silent %s/\\ominus\>/⊖/eg
-    silent %s/\\oslash\>/⊘/eg
-    silent %s/\\bigcirc\>/○/eg
-    silent %s/\\bigtriangledown\>/▽/eg
-    silent %s/\\rhd\>/⊳/eg
-    silent %s/\\unrhd\>/⊵/eg
-    silent %s/\\triangleleft\>/◁/eg
-    silent %s/\\triangleright\>/▷/eg
-    silent %s/\\star\>/⋆/eg
-    silent %s/\\ast\>/∗/eg
-    silent %s/\\circ\>/∘/eg
-    silent %s/\\bullet\>/∙/eg
-    silent %s/\\diamond\>/⋄/eg
-    silent %s/\\uplus\>/⊎/eg
-    silent %s/\\dagger\>/†/eg
-    silent %s/\\ddagger\>/‡/eg
-    silent %s/\\wr\>/≀/eg
-    silent %s/\\sum\>/∑/eg
-    silent %s/\\prod\>/∏/eg
-    silent %s/\\coprod\>/∐/eg
-    silent %s/\\int\>/∫/eg
-    silent %s/\\bigcup\>/⋃/eg
-    silent %s/\\bigcap\>/⋂/eg
-    silent %s/\\bigsqcup\>/⊔/eg
-    silent %s/\\oint\>/∮/eg
-    silent %s/\\bigvee\>/⋁/eg
-    silent %s/\\bigwedge\>/⋀/eg
-    silent %s/\\bigoplus\>/⊕/eg
-    silent %s/\\bigotimes\>/⊗/eg
-    silent %s/\\bigodot\>/⊙/eg
-    silent %s/\\biguplus\>/⊎/eg
-    silent %s/\\leftarrow\>/←/eg
-    silent %s/\\rightarrow\>/→/eg
-    silent %s/\\leftrightarrow\>/↔/eg
-    silent %s/\\Leftarrow\>/⇐/eg
-    silent %s/\\Rightarrow\>/⇒/eg
-    silent %s/\\Leftrightarrow\>/⇔/eg
-    silent %s/\\mapsto\>/↦/eg
-    silent %s/\\hookleftarrow\>/↩/eg
-    silent %s/\\leftharpoonup\>/↼/eg
-    silent %s/\\leftharpoondown\>/↽/eg
-    silent %s/\\hookrightarrow\>/↪/eg
-    silent %s/\\rightharpoonup\>/⇀/eg
-    silent %s/\\rightharpoondown\>/⇁/eg
-    silent %s/\\longleftarrow\>/←/eg
-    silent %s/\\longrightarrow\>/→/eg
-    silent %s/\\longleftrightarrow\>/↔/eg
-    silent %s/\\Longleftarrow\>/⇐/eg
-    silent %s/\\Longrightarrow\>/⇒/eg
-    silent %s/\\Longleftrightarrow\>/⇔/eg
-    silent %s/\\longmapsto\>/⇖/eg
-    silent %s/\\uparrow\>/↑/eg
-    silent %s/\\downarrow\>/↓/eg
-    silent %s/\\updownarrow\>/↕/eg
-    silent %s/\\Uparrow\>/⇑/eg
-    silent %s/\\Downarrow\>/⇓/eg
-    silent %s/\\Updownarrow\>/⇕/eg
-    silent %s/\\nearrow\>/↗/eg
-    silent %s/\\searrow\>/↘/eg
-    silent %s/\\swarrow\>/↙/eg
-    silent %s/\\nwarrow\>/↖/eg
-    silent %s/\\leadsto\>/↝/eg
-    silent %s/\\dots\>/…/eg
-    silent %s/\\cdots\>/⋯/eg
-    silent %s/\\vdots\>/⋮/eg
-    silent %s/\\ddots\>/⋱/eg
-    silent %s/\\hbar\>/ℏ/eg
-    silent %s/\\ell\>/ℓ/eg
-    silent %s/\\Re\>/ℜ/eg
-    silent %s/\\Im\>/ℑ/eg
-    silent %s/\\aleph\>/א/eg
-    silent %s/\\wp\>/℘/eg
-    silent %s/\\forall\>/∀/eg
-    silent %s/\\exists\>/∃/eg
-    silent %s/\\mho\>/℧/eg
-    silent %s/\\partial\>/∂/eg
-    silent %s/\\prime\>/′/eg
-    silent %s/\\emptyset\>/∅/eg
-    silent %s/\\infty\>/∞/eg
-    silent %s/\\nabla\>/∇/eg
-    silent %s/\\triangle\>/△/eg
-    silent %s/\\Box\>/□/eg
-    silent %s/\\Diamond\>/◇/eg
-    silent %s/\\bot\>/⊥/eg
-    silent %s/\\top\>/⊤/eg
-    silent %s/\\angle\>/∠/eg
-    silent %s/\\surd\>/√/eg
-    silent %s/\\diamondsuit\>/♢/eg
-    silent %s/\\heartsuit\>/♡/eg
-    silent %s/\\clubsuit\>/♣/eg
-    silent %s/\\spadesuit\>/♠/eg
-    silent %s/\\neg\>/¬/eg
-    silent %s/\\flat\>/♭/eg
-    silent %s/\\natural\>/♮/eg
-    silent %s/\\sharp\>/♯/eg
-    silent %s/\\digamma\>/Ϝ/eg
-    silent %s/\\varkappa\>/ϰ/eg
-    silent %s/\\beth\>/ב/eg
-    silent %s/\\daleth\>/ד/eg
-    silent %s/\\gimel\>/ג/eg
-    silent %s/\\lessdot\>/⋖/eg
-    silent %s/\\leqslant\>/≤/eg
-    silent %s/\\leqq\>/≦/eg
-    silent %s/\\lll\>/⋘/eg
-    silent %s/\\lesssim\>/≲/eg
-    silent %s/\\lessgtr\>/≶/eg
-    silent %s/\\lesseqgtr\>/⋚/eg
-    silent %s/\\preccurlyeq\>/≼/eg
-    silent %s/\\curlyeqprec\>/⋞/eg
-    silent %s/\\precsim\>/≾/eg
-    silent %s/\\Subset\>/⋐/eg
-    silent %s/\\sqsubset\>/⊏/eg
-    silent %s/\\therefore\>/∴/eg
-    silent %s/\\smallsmile\>/⌣/eg
-    silent %s/\\vartriangleleft\>/⊲/eg
-    silent %s/\\trianglelefteq\>/⊴/eg
-    silent %s/\\gtrdot\>/⋗/eg
-    silent %s/\\geqq\>/≧/eg
-    silent %s/\\ggg\>/⋙/eg
-    silent %s/\\gtrsim\>/≳/eg
-    silent %s/\\gtrless\>/≷/eg
-    silent %s/\\gtreqless\>/⋛/eg
-    silent %s/\\succcurlyeq\>/≽/eg
-    silent %s/\\curlyeqsucc\>/⋟/eg
-    silent %s/\\succsim\>/≿/eg
-    silent %s/\\Supset\>/⋑/eg
-    silent %s/\\sqsupset\>/⊐/eg
-    silent %s/\\because\>/∵/eg
-    silent %s/\\shortparallel\>/∥/eg
-    silent %s/\\smallfrown\>/⌢/eg
-    silent %s/\\vartriangleright\>/⊳/eg
-    silent %s/\\trianglerighteq\>/⊵/eg
-    silent %s/\\doteqdot\>/≑/eg
-    silent %s/\\risingdotseq\>/≓/eg
-    silent %s/\\fallingdotseq\>/≒/eg
-    silent %s/\\eqcirc\>/≖/eg
-    silent %s/\\circeq\>/≗/eg
-    silent %s/\\triangleq\>/≜/eg
-    silent %s/\\bumpeq\>/≏/eg
-    silent %s/\\Bumpeq\>/≎/eg
-    silent %s/\\thicksim\>/∼/eg
-    silent %s/\\thickapprox\>/≈/eg
-    silent %s/\\approxeq\>/≊/eg
-    silent %s/\\backsim\>/∽/eg
-    silent %s/\\vDash\>/⊨/eg
-    silent %s/\\Vdash\>/⊩/eg
-    silent %s/\\Vvdash\>/⊪/eg
-    silent %s/\\backepsilon\>/∍/eg
-    silent %s/\\varpropto\>/∝/eg
-    silent %s/\\between\>/≬/eg
-    silent %s/\\pitchfork\>/⋔/eg
-    silent %s/\\blacktriangleleft\>/◀/eg
-    silent %s/\\blacktriangleright\>/▷/eg
-    silent %s/\\dashleftarrow\>/⇠/eg
-    silent %s/\\leftleftarrows\>/⇇/eg
-    silent %s/\\leftrightarrows\>/⇆/eg
-    silent %s/\\Lleftarrow\>/⇚/eg
-    silent %s/\\twoheadleftarrow\>/↞/eg
-    silent %s/\\leftarrowtail\>/↢/eg
-    silent %s/\\leftrightharpoons\>/⇋/eg
-    silent %s/\\Lsh\>/↰/eg
-    silent %s/\\looparrowleft\>/↫/eg
-    silent %s/\\curvearrowleft\>/↶/eg
-    silent %s/\\circlearrowleft\>/↺/eg
-    silent %s/\\dashrightarrow\>/⇢/eg
-    silent %s/\\rightrightarrows\>/⇉/eg
-    silent %s/\\rightleftarrows\>/⇄/eg
-    silent %s/\\Rrightarrow\>/⇛/eg
-    silent %s/\\twoheadrightarrow\>/↠/eg
-    silent %s/\\rightarrowtail\>/↣/eg
-    silent %s/\\rightleftharpoons\>/⇌/eg
-    silent %s/\\Rsh\>/↱/eg
-    silent %s/\\looparrowright\>/↬/eg
-    silent %s/\\curvearrowright\>/↷/eg
-    silent %s/\\circlearrowright\>/↻/eg
-    silent %s/\\multimap\>/⊸/eg
-    silent %s/\\upuparrows\>/⇈/eg
-    silent %s/\\downdownarrows\>/⇊/eg
-    silent %s/\\upharpoonleft\>/↿/eg
-    silent %s/\\upharpoonright\>/↾/eg
-    silent %s/\\downharpoonleft\>/⇃/eg
-    silent %s/\\downharpoonright\>/⇂/eg
-    silent %s/\\rightsquigarrow\>/⇝/eg
-    silent %s/\\leftrightsquigarrow\>/↭/eg
-    silent %s/\\dotplus\>/∔/eg
-    silent %s/\\ltimes\>/⋉/eg
-    silent %s/\\Cup\>/⋓/eg
-    silent %s/\\veebar\>/⊻/eg
-    silent %s/\\boxplus\>/⊞/eg
-    silent %s/\\boxtimes\>/⊠/eg
-    silent %s/\\leftthreetimes\>/⋋/eg
-    silent %s/\\curlyvee\>/⋎/eg
-    silent %s/\\centerdot\>/⋅/eg
-    silent %s/\\rtimes\>/⋈/eg
-    silent %s/\\Cap\>/⋒/eg
-    silent %s/\\barwedge\>/⊼/eg
-    silent %s/\\boxminus\>/⊟/eg
-    silent %s/\\boxdot\>/⊡/eg
-    silent %s/\\rightthreetimes\>/⋌/eg
-    silent %s/\\curlywedge\>/⋏/eg
-    silent %s/\\intercal\>/⊺/eg
-    silent %s/\\divideontimes\>/⋇/eg
-    silent %s/\\smallsetminus\>/∖/eg
-    silent %s/\\circleddash\>/⊝/eg
-    silent %s/\\circledcirc\>/⊚/eg
-    silent %s/\\circledast\>/⊛/eg
-    silent %s/\\hbar\>/ℏ/eg
-    silent %s/\\hslash\>/ℏ/eg
-    silent %s/\\square\>/□/eg
-    silent %s/\\blacksquare\>/■/eg
-    silent %s/\\circledS\>/Ⓢ/eg
-    silent %s/\\vartriangle\>/△/eg
-    silent %s/\\blacktriangle\>/▲/eg
-    silent %s/\\complement\>/∁/eg
-    silent %s/\\triangledown\>/▽/eg
-    silent %s/\\blacktriangledown\>/▼/eg
-    silent %s/\\lozenge\>/◊/eg
-    silent %s/\\blacklozenge\>/◆/eg
-    silent %s/\\bigstar\>/★/eg
-    silent %s/\\angle\>/∠/eg
-    silent %s/\\measuredangle\>/∡/eg
-    silent %s/\\sphericalangle\>/∢/eg
-    silent %s/\\backprime\>/‵/eg
-    silent %s/\\nexists\>/∄/eg
-    silent %s/\\Finv\>/Ⅎ/eg
-    silent %s/\\varnothing\>/∅/eg
-    silent %s/\\eth\>/ð/eg
-    silent %s/\\mho\>/℧/eg
-    call cursor(s:line,s:column)
-endfunction
-
-nnoremap <buffer> <LocalLeader>cl :call UTF8toLaTeX()<CR>
-nnoremap <buffer> <LocalLeader>cu :call LaTeXtoUTF8()<CR>
-command! Convert2Latex :call UTF8toLaTeX()
-command! Convert2UTF8 :call LaTeXtoUTF8()
-
-" augroup LaTeX
-"     au!
-"     autocmd BufWritePre *.tex :Convert2Latex
-"     autocmd BufWritePost *.tex :Convert2UTF8
-" augroup END
diff --git a/nvim/after/ftplugin/vim/folding.vim b/nvim/after/ftplugin/vim/folding.vim
deleted file mode 100644
index 1454cbe..0000000
--- a/nvim/after/ftplugin/vim/folding.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-function! VimFolds()
-    let thisline = getline(v:lnum)
-    if match(thisline,'^"" ') >= 0
-        return ">1"
-    elseif match(thisline,'^" ') >=0
-        return ">1"
-    else
-        return "="
-    endif
-endfunction
-
-function! VimFoldText()
-    let startline = getline(v:foldstart)
-    if match(startline,'^"" ') >= 0
-        let title = substitute(startline,'^"" \(.*\)$','\1',"")
-        return '# ' . title
-    elseif match(startline,'^" ') >=0
-        let title = substitute(startline,'^" \(.*\)$','\1',"")
-        return '    ## ' .title
-    endif
-endfunction
-
-setlocal foldmethod=expr
-setlocal foldexpr=VimFolds()
-setlocal foldtext=VimFoldText()
diff --git a/nvim/after/syntax/cpp.vim b/nvim/after/syntax/cpp.vim
deleted file mode 100644
index 4da741d..0000000
--- a/nvim/after/syntax/cpp.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-syntax keyword mPigroup pi
-hi def link mPigroup Todo
-
diff --git a/nvim/after/syntax/cpp.vim~ b/nvim/after/syntax/cpp.vim~
deleted file mode 100644
index e69de29..0000000
--- a/nvim/after/syntax/cpp.vim~
+++ /dev/null
diff --git a/nvim/after/syntax/tex.vim b/nvim/after/syntax/tex.vim
deleted file mode 100644
index a40cc30..0000000
--- a/nvim/after/syntax/tex.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-syn match texMathSymbol '\\arr\>' contained conceal cchar=←
-syn match texMathSymbol '\\,' contained conceal cchar= 
-syn match texMathSymbol '\\mathcal' contained conceal cchar= 
-syn match texMathSymbol '\\text' contained conceal cchar= 
-syn match texMathSymbol '\\mathbb' contained conceal cchar= 
-syn match texMathSymbol '\\quad' contained conceal cchar=  
diff --git a/nvim/after/syntax/tex.vim~ b/nvim/after/syntax/tex.vim~
deleted file mode 100644
index 4e1d112..0000000
--- a/nvim/after/syntax/tex.vim~
+++ /dev/null
@@ -1,6 +0,0 @@
-syn match texMathSymbol '\\arr\>' contained conceal cchar=←
-syn match texMathSymbol '\\,' contained conceal cchar= 
-syn match texMathSymbol '\\mathcal' contained conceal cchar= 
-syn match texMathSymbol '\\text' contained conceal cchar= 
-syn match texMathSymbol '\\mathbb' contained conceal cchar= 
-syn match texMathSymbol '\\quad' contained conceal cchar= 
diff --git a/nvim/colors/mine.vim b/nvim/colors/mine.vim
deleted file mode 100644
index 653682e..0000000
--- a/nvim/colors/mine.vim
+++ /dev/null
@@ -1,29 +0,0 @@
-" Vim color file
-"  Maintainer: Urbain
-" Last Change: 2002/10/14 Mon 16:41.
-"     version: 1.0
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "mine"
-
-" Syntax group
-hi Comment gui=none guifg=#af5f00
-hi Normal guibg=white guifg=Black
-hi Type gui=none guifg=#005f00
-hi Statement gui=none guifg=#5f0000
-hi Special guifg=Black
-hi Constant guifg=Gray
-hi Error guifg=Red guibg=White
-hi Preproc guifg=Blue "\end
-hi Constant guifg=Green "\ $$
-hi Identifier guifg=Blue "\begin
-hi LineNr gui=none guifg=Gray
-hi FoldColumn guibg=#F5F4FD
-hi Todo guibg=white gui=underline,italic guifg=Red
-hi Conceal guibg=White guifg=DarkGreen
diff --git a/nvim/colors/mine.vim~ b/nvim/colors/mine.vim~
deleted file mode 100644
index 653682e..0000000
--- a/nvim/colors/mine.vim~
+++ /dev/null
@@ -1,29 +0,0 @@
-" Vim color file
-"  Maintainer: Urbain
-" Last Change: 2002/10/14 Mon 16:41.
-"     version: 1.0
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "mine"
-
-" Syntax group
-hi Comment gui=none guifg=#af5f00
-hi Normal guibg=white guifg=Black
-hi Type gui=none guifg=#005f00
-hi Statement gui=none guifg=#5f0000
-hi Special guifg=Black
-hi Constant guifg=Gray
-hi Error guifg=Red guibg=White
-hi Preproc guifg=Blue "\end
-hi Constant guifg=Green "\ $$
-hi Identifier guifg=Blue "\begin
-hi LineNr gui=none guifg=Gray
-hi FoldColumn guibg=#F5F4FD
-hi Todo guibg=white gui=underline,italic guifg=Red
-hi Conceal guibg=White guifg=DarkGreen
diff --git a/nvim/mySnippets/all.snippets b/nvim/mySnippets/all.snippets
deleted file mode 100644
index 8094025..0000000
--- a/nvim/mySnippets/all.snippets
+++ /dev/null
@@ -1,25 +0,0 @@
-global !p
-def make_comment():
-	b, e = vim.eval("&commentstring").split( '%s' )
-	return b, e
-endglobal
-
-snippet todo "A universal TODO reminder" b
-`!p
-comment = make_comment()
-snip.rv = comment[ 0 ]
-` TODO: ${1:desc} (`!v $USER`, `!v strftime("%c")`) `!p
-comment = make_comment()
-snip.rv = comment[ 1 ]`
-$0
-endsnippet
-
-snippet fix "A universal FIXME reminder" b
-`!p
-comment = make_comment()
-snip.rv = comment[ 0 ]
-` FIXME: ${1:desc} (`!v $USER`, `!v strftime("%c")`) `!p
-comment = make_comment()
-snip.rv = comment[ 1 ]`
-$0
-endsnippet
diff --git a/nvim/mySnippets/cpp.snippets b/nvim/mySnippets/cpp.snippets
deleted file mode 100644
index d314641..0000000
--- a/nvim/mySnippets/cpp.snippets
+++ /dev/null
@@ -1,35 +0,0 @@
-snippet print_mat "Print matrix" b
-for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
-	cout << setw(12) << $1[iii][0];
-	for (unsigned int jjj = 1; jjj < $1.size(); ++jjj) {
-		cout << ", ";
-		cout << setw(12) << $1[iii][jjj];
-	}
-	cout << endl;
-}
-$0
-endsnippet
-
-snippet print_vec "Print vector" b
-for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
-	cout << setw(12) << $1[iii];
-	cout << endl;
-}
-$0
-endsnippet
-
-snippet forij "Matrix iteration" b
-for (int ${2:i} = 0; $2 < ${1:count}; $2++) {
-	for (int ${4:j} = 0; $4 < $1; $4++) {
-		${5}
-	}
-}
-endsnippet
-
-snippet vec "vector" i
-vector<${1:double}> $0
-endsnippet
-
-snippet mat "matrix" i
-vector< vector<${1:double}> > $0
-endsnippet
diff --git a/nvim/mySnippets/mail.snippets b/nvim/mySnippets/mail.snippets
deleted file mode 100644
index 9839916..0000000
--- a/nvim/mySnippets/mail.snippets
+++ /dev/null
@@ -1,33 +0,0 @@
-snippet best "Best wishes" b
-Best wishes,
-
-Urbain
-endsnippet
-
-snippet dear "Email template" b
-Dear ${1:Greg},
-
-${2:# Body of the message}
-
-Best wishes,
-
-${3:Urbain}
-endsnippet
-
-snippet sign "Signature" b
-Best wishes,
-
-Urbain Vaes
-Department of Mathematics
-Office 6M09
-endsnippet
-
-snippet bisous "Gros bisous" b
-Gros bisous,
-
-Urbain
-endsnippet
-
-snippet look "I'm looking forward to ..." b
-I am looking forward to hearing from you,
-endsnippet
diff --git a/nvim/mySnippets/python.snippets b/nvim/mySnippets/python.snippets
deleted file mode 100644
index 4a7d74d..0000000
--- a/nvim/mySnippets/python.snippets
+++ /dev/null
@@ -1,4 +0,0 @@
-snippet nicolas "Nicolas" i
-Nicolas est le meilleur programmeur $1
-$0
-endsnippet
diff --git a/nvim/mySnippets/tex.snippets b/nvim/mySnippets/tex.snippets
deleted file mode 100644
index 884cc2d..0000000
--- a/nvim/mySnippets/tex.snippets
+++ /dev/null
@@ -1,110 +0,0 @@
-snippet real "Field of real numbers" i
-\real
-endsnippet
-
-snippet grad "Gradient" i
-\grad
-endsnippet
-
-snippet div "Divergence" i
-\dive
-endsnippet
-
-snippet new "New command" b
-\newcommand{$1}[$2]{$3}$0
-endsnippet
-
-snippet op "Operator style" i
-\op
-endsnippet
-
-snippet pard "Partial derivative" i
-\pardl{$1}{$2}$0
-endsnippet
-
-snippet pardd "Double partial derivative" i
-\parddl{$1}{$2}$0
-endsnippet
-
-snippet herm "Hermite polynomials" i
-\hermite
-endsnippet
-
-snippet red "Red text" i
-\red{$1}$0
-endsnippet
-
-snippet sumi "Sum over index set" i
-\sum_{${1:i} \in ${2:I}}$0
-endsnippet
-
-snippet int "Integral" i
-\int_{$1}
-endsnippet
-
-snippet ip "Inner product" i
-\ip{$1}{$2}$0
-endsnippet
-
-snippet ipw "Inner product" i
-\wip{$1}{$2}{$3}$0
-endsnippet
-
-snippet norm "Norm" i
-\norm{$1}$0
-endsnippet
-
-snippet normw "Weighted norm" i
-\wnorm{$1}{${2:\gamma}}
-endsnippet
-
-snippet test "Test functions" i
-\test{${1:\real^n}}$0
-endsnippet
-
-snippet lp "Lp spaces" w
-\lp{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
-endsnippet
-
-snippet  sob "Sobolev spaces" w
-\sobolev{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
-endsnippet
-
-snippet cont "Continuous function" i
-\cont{$1}{$2}$0
-endsnippet
-
-snippet mean "Expectation" i
-\expect $0
-endsnippet
-
-snippet dot "Dot product" i
-\dotx
-endsnippet
-
-snippet abs "Absolute value" i
-\abs{ $1 }$0
-endsnippet
-
-snippet sum "Sum" i
-\sum_{${1:i=1}}^{${2:n}}
-endsnippet
-
-snippet smooth "Smooth function" i
-\smooth{${1:\real^n}} $0
-endsnippet
-
-snippet cont "Continuous function" i
-\cont{$1}{$2} $0
-endsnippet
-
-snippet ref "Clever reference" i
-\cref{$1}$0
-endsnippet
-
-snippet frame "My frame snippet" b
-\begin{frame}
-	\frametitle{$1}
-	$0
-\end{frame}
-endsnippet
diff --git a/nvim/mySnippets/vim.snippets b/nvim/mySnippets/vim.snippets
deleted file mode 100644
index e69de29..0000000
--- a/nvim/mySnippets/vim.snippets
+++ /dev/null
diff --git a/nvim/spell/en.utf-8.add b/nvim/spell/en.utf-8.add
deleted file mode 100644
index 1d49910..0000000
--- a/nvim/spell/en.utf-8.add
+++ /dev/null
@@ -1,3 +0,0 @@
-Plugin
-Colorscheme
-vim
diff --git a/nvim/spell/en.utf-8.add.spl b/nvim/spell/en.utf-8.add.spl
deleted file mode 100644
index d34ca08..0000000
--- a/nvim/spell/en.utf-8.add.spl
+++ /dev/null
diff --git a/nvim/spell/en.utf-8.spl b/nvim/spell/en.utf-8.spl
deleted file mode 100644
index a41bf79..0000000
--- a/nvim/spell/en.utf-8.spl
+++ /dev/null
diff --git a/nvim/spell/en.utf-8.sug b/nvim/spell/en.utf-8.sug
deleted file mode 100644
index b82667d..0000000
--- a/nvim/spell/en.utf-8.sug
+++ /dev/null
diff --git a/nvimrc b/nvimrc
index 9294359..c9a3c9c 100644..120000
--- a/nvimrc
+++ b/nvimrc
@@ -1,308 +1 @@
-"" Plugins
-call plug#begin('~/.nvim/plugged')
-Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' }
-Plug 'altercation/vim-colors-solarized'
-Plug 'AndrewRadev/splitjoin.vim'
-Plug 'benekastah/neomake' , { 'for' : 'cpp' }
-Plug 'bling/vim-airline'
-Plug 'christoomey/vim-tmux-navigator'
-Plug 'freeo/vim-kalisi'
-Plug 'godlygeek/tabular' , { 'on' : 'Tab' }
-Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
-Plug 'honza/vim-snippets'
-Plug 'itchyny/calendar.vim', { 'on' : 'Calendar' }
-Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
-Plug 'junegunn/fzf'
-Plug 'junegunn/seoul256.vim'
-Plug 'junegunn/vim-pseudocl'
-Plug 'junegunn/vim-oblique'
-Plug 'junegunn/vim-peekaboo'
-Plug 'junegunn/rainbow_parentheses.vim'
-Plug 'justinmk/vim-sneak'
-Plug 'kassio/neoterm', { 'on' : 'T' }
-Plug 'kien/ctrlp.vim'
-" Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' }
-Plug 'lervag/vimtex', { 'for' : 'tex' }
-Plug 'majutsushi/tagbar'
-Plug 'mileszs/ack.vim', { 'on' : 'Ack' }
-Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' }
-Plug 'ryanss/vim-hackernews', { 'on' : 'HackerNews' }
-Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
-Plug 'scrooloose/syntastic'
-Plug 'SirVer/ultisnips'
-Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
-Plug 'terryma/vim-multiple-cursors'
-Plug 'tomasr/molokai'
-Plug 'tommcdo/vim-exchange'
-Plug 'ton/vim-bufsurf'
-Plug 'tpope/vim-abolish', { 'for' : 'tex' }
-Plug 'tpope/vim-commentary'
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-git'
-Plug 'tpope/vim-obsession'
-Plug 'tpope/vim-repeat'
-Plug 'tpope/vim-sensible'
-Plug 'tpope/vim-surround'
-Plug 'tpope/vim-unimpaired'
-Plug 'troydm/zoomwintab.vim'
-Plug 'Valloric/YouCompleteMe', { 'do' : './install.sh --clang-completer' }
-Plug 'xolox/vim-misc', { 'on' : 'Note' }
-Plug 'xolox/vim-notes', { 'on' : 'Note' }
-call plug#end()
-
-"" Plugins options
-" let g:LatexBox_fold_automatic=0
-" let g:LatexBox_latexmk_preview_continuously=1
-" let g:LatexBox_quickfix=2
-" let g:LatexBox_viewer='zathura'
-let g:vimtex_fold_enabled=0
-let g:vimtex_view_method='zathura'
-let g:vimtex_latexmk_continuous=1
-let g:vimtex_quickfix_mode=0
-
-let g:UltiSnipsEditSplit="horizontal"
-let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
-let g:UltiSnipsJumpForwardTrigger="<tab>"
-let g:UltiSnipsListSnippets="<c-l>"
-let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
-let g:UltiSnipsSnippetsDir="~/.nvim/mySnippets"
-
-let g:airline_left_sep=''
-let g:airline_right_sep=''
-let g:airline_section_c = '%f%m'
-let g:airline_section_y = ''
-let g:airline_section_z = '%3p%%|%3l|%3c'
-let g:airline_theme='dark'
-let g:airline#extensions#tabline#enabled = 0
-let g:airline_exclude_preview = 0
-
-let g:bufferline_active_buffer_left = ''
-let g:bufferline_active_buffer_right = ''
-let g:bufferline_echo = 0
-let g:bufferline_modified = '+'
-let g:bufferline_rotate = 0
-
-nnoremap <a-p> :CtrlPMRUFiles<cr>
-let g:ctrlp_by_filename = 1
-let g:ctrlp_cmd = 'CtrlPBuffer'
-let g:ctrlp_map = '<c-p>'
-let g:ctrlp_open_new_file = 't'
-let g:ctrlp_show_hidden = 1
-let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
-let g:ctrlp_working_path_mode = 'r'
-let g:ctrlp_prompt_mappings = {
-    \ 'PrtSelectMove("j")':   ['<c-n>'],
-    \ 'PrtSelectMove("k")':   ['<c-p>'],
-    \ 'PrtHistory(-1)':       ['<c-j>'],
-    \ 'PrtHistory(1)':        ['<c-k>'],}
-
-let g:limelight_conceal_ctermfg = 'gray'
-let g:limelight_conceal_ctermfg = 240
-
-let g:syntastic_cpp_compiler = "g++"
-let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
-let g:syntastic_error_symbol = "✗"
-let g:syntastic_warning_symbol = "W"
-
-let g:tagbar_width = 30
-let g:tagbar_show_linenumbers=1
-let g:tagbar_autofocus=1
-
-let g:tex_conceal= 'adgm'
-let g:tex_flavor='latex'
-let g:tex_fast=""
-
-let g:tmuxline_preset = {'a':'#H','b':'#S','win':'#W','cwin':'#W','x':'%R','y':'%a','z':'%Y'}
-let g:tmuxline_separators = {'left':'','left_alt':'>','right':'','right_alt':'<','space':' '}
-let g:tmuxline_theme='airline'
-
-let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
-            \ '\.fls$','\.bbl$','\.blg$',
-            \ '\.out$', '\.log$','\.aux$','\.sty$',
-            \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$']
-
-let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
-let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
-let g:ycm_add_preview_to_completeopt = 0
-let g:ycm_confirm_extra_conf = 0
-let g:ycm_auto_trigger = 1
-if !exists('g:ycm_semantic_triggers')
-    let g:ycm_semantic_triggers = {}
-endif
-let g:ycm_semantic_triggers.tex = ['re!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*' ]
-
-let g:calendar_google_calendar = 1
-let g:calendar_google_task = 1
-
-"" Vim options
-
-" Tabs and indent
-set smartindent
-set expandtab
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-
-" Folds
-set foldcolumn=0
-set nofoldenable
-set foldmethod=expr
-set foldlevel=0
-
-" Back up files
-set noswapfile
-set nowritebackup
-set undofile
-set undodir=/home/urbain/.nvim/vimundo/
-
-" Layout window
-set nonumber
-set diffopt=filler,vertical
-set listchars=tab:▸\ ,eol:¬,trail:-
-set fillchars=fold:\ ,vert:\ ,
-set breakindent
-let &showbreak='--> '
-set colorcolumn=0
-set scrolloff=0
-set t_Co=256
-set guitablabel=%N\ %t\ %M
-set showcmd
-
-" Layout text
-set wrap
-set linebreak
-set textwidth=0
-set conceallevel=2
-set formatprg=par\ w80
-set guifont=Monaco\ 11
-
-" Case and spell
-set nospell
-set spellfile="/home/urbain/.vim/spell/en.utf-8.add"
-set smartcase
-set ignorecase
-
-" Misc
-set noautochdir
-set cpoptions+=Iq
-set encoding=utf-8
-set mouse=a
-set clipboard=unnamedplus
-set lazyredraw
-set hidden
-
-" Colorscheme
-silent! colo molokai
-highlight Comment cterm=italic
-set t_ZH=
-set t_ZR=
-
-"" Maps
-
-" Definition of leaders
-let mapleader = "\\"
-let maplocalleader = "-"
-nmap <Space> <Leader>
-
-" New pages
-nnoremap <Leader>pe :tabedit
-nnoremap <Leader>pn :tabnew<cr>
-nnoremap <Leader>po :tabonly<cr>
-
-" Plugin Management
-nnoremap <Leader>pi :PlugInstall<cr>
-nnoremap <Leader>pu :PlugUpdate<cr>
-nnoremap <Leader>pc :PlugClean<cr>
-nnoremap <Leader>pd :PlugDiff<cr>
-nnoremap <Leader>ps :PlugStatus<cr>
-
-" Toggles (cp : change [stote of] plugin / yi? (you inverse) )
-nnoremap cop :set paste!<cr>
-nnoremap cof :set foldenable!<cr>
-nnoremap cpg :GitGutterToggle<cr>
-nnoremap cpn :NERDTreeToggle<cr>
-nnoremap cpt :TagbarToggle<cr>
-nnoremap cpu :GundoToggle<cr>
-
-" Sourcing
-nnoremap <Leader>sv :source ~/.vimrc<cr>
-nnoremap <Leader>sc :source %<cr>
-
-" File edits
-nnoremap <Leader>es :UltiSnipsEdit<cr>
-nnoremap <Leader>em :e ~/dotfiles/mutt/muttrc<cr>
-nnoremap <Leader>en :e ~/dotfiles/nvimrc<cr>
-nnoremap <Leader>ev :e ~/dotfiles/vimrc<cr>
-nnoremap <Leader>ez :e ~/dotfiles/zshrc<cr>
-nnoremap <Leader>et :e ~/dotfiles/tmux.conf<cr>
-
-" Formatting
-nnoremap <Leader>fw :%s/\s\+$//<cr>
-nnoremap <Leader>fi zzmxgg=G'x
-
-" Navigation
-nnoremap (( :BufSurfBack<CR>
-nnoremap )) :BufSurfForward<CR>
-nnoremap <c-y> 3<c-y>
-nnoremap <c-e> 3<c-e>
-nnoremap <Return> o<Esc>
-nnoremap <s-Return> O<Esc>
-nnoremap >f :FZF ~ <cr>
-
-" Git
-nnoremap <Leader>gs :Gstatus<cr>
-nnoremap <Leader>gr :Gread<cr>
-nnoremap <Leader>gd :Gdiff<cr>
-nnoremap <Leader>gv :Gitv<cr>
-
-" Commands
-nnoremap ym :Neomake!<cr>
-
-" Misc
-nnoremap <tab> <C-^>
-nnoremap Q :bd!<cr>
-nnoremap <Leader>w :w<cr>
-nnoremap <Leader>q :q!<cr>
-nnoremap <LocalLeader>h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp,<CR>
-nnoremap J mzJ`z
-nnoremap Y y$
-nnoremap + za
-
-" Dvorak specific
-nnoremap : ,
-vnoremap : ,
-nnoremap , :
-vnoremap , :
-
-" Neovim specific
-tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
-tnoremap <C-p> <C-\><C-n>:CtrlPMRUFiles<cr>
-nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
-inoremap <C-_> <Esc>:b term<cr>i
-
-"" Restore cursor position
-augroup nvimrc
-    au!
-    autocmd BufWritePost *vimrc source %
-    autocmd BufWritePost *.cpp Neomake!
-    autocmd BufReadPost *
-                \ if line("'\"") > 1 && line("'\"") <= line("$") |
-                \   exe "normal! g`\"" |
-                \ endif
-augroup END
-
-"" Taken from Junegunn Chong
-nnoremap <silent> <Leader>C :call fzf#run({
-\   'source':
-\     map(split(globpath(&rtp, "colors/*.vim"), "\n"),
-\         "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"),
-\   'sink':     'colo',
-\   'options':  '+m',
-\   'left':     30,
-\   'launcher': 'iterm2-launcher 20 30 %s'
-\ })<CR>
-
-"" Experimental
-let g:notes_directories = ['~/dotfiles/notes']
-" Idea: instant download colorscheme
+vimrc
\ No newline at end of file
diff --git a/vim/after/ftplugin/tex/mappings.vim b/vim/after/ftplugin/tex/mappings.vim
index a8753bb..e7dd610 100644
--- a/vim/after/ftplugin/tex/mappings.vim
+++ b/vim/after/ftplugin/tex/mappings.vim
@@ -31,20 +31,29 @@ iabbrev <buffer> gp \pi
 iabbrev <buffer> gw \omega
 iabbrev <buffer> dd \d
 
-function! SynctexShow()
-    let synctex = glob("*.synctex.gz")
-    if strlen(synctex) == 0
-        echom "no synctex file found"
-    else
-        let pdffile = substitute(synctex,"synctex.gz","pdf","")
-        let execline = printf(":!zathura --synctex-forward %d:%d:%s %s", line('.'), col('.'), shellescape(bufname("%")), shellescape(pdffile))
-        exec execline
-    end
-endfunction
+" function! SynctexShow()
+"     let synctex = glob("*.synctex.gz")
+"     if strlen(synctex) == 0
+"         echom "no synctex file found"
+"     else
+"         let pdffile = substitute(synctex,"synctex.gz","pdf","")
+"         let execline = printf(":!zathura --synctex-forward %d:%d:%s %s", line('.'), col('.'), shellescape(bufname("%")), shellescape(pdffile))
+"         exec execline
+"     end
+" endfunction
 
-nnoremap <buffer> <LocalLeader>a :call SynctexShow()<CR><CR>
-nnoremap <buffer> <LocalLeader>i :Latexmk<CR>
-nnoremap <buffer> <LocalLeader>e :LatexErrors<CR>
-nnoremap <buffer> <LocalLeader>o :LatexView<CR>
-nnoremap <buffer> <LocalLeader>k :LatexmkStop<CR>:LatexmkClean<CR>
+" nnoremap <buffer> <LocalLeader>a :call SynctexShow()<CR><CR>
+" nnoremap <buffer> <LocalLeader>i :Latexmk<CR>
+" nnoremap <buffer> <LocalLeader>e :LatexErrors<CR>
+" nnoremap <buffer> <LocalLeader>o :LatexView<CR>
+" noremap  <buffer> <LocalLeader>k :LatexmkStop<CR>:LatexmkClean<CR>
+" nnoremap <buffer> <LocalLeader>h :split header.sty<CR>
+
+
+nnoremap <buffer> <LocalLeader>i :VimtexCompile<CR>
+nnoremap <buffer> <LocalLeader>e :VimtexErrors<CR>
+nnoremap <buffer> <LocalLeader>o :VimtexView<CR>
+nnoremap <buffer> <LocalLeader>k :VimtexStop<CR>:VimtexClean<CR>
+nnoremap <buffer> <LocalLeader>t :VimtexTocToggle<CR>
+nnoremap <buffer> <LocalLeader>h :split header.sty<CR>
 nnoremap <buffer> <LocalLeader>h :split header.sty<CR>
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
new file mode 160000
+Subproject cfd3b2d388a8c2e9903d7a9d80a65539aabfe93
diff --git a/vim/mySnippets/cpp.snippets b/vim/mySnippets/cpp.snippets
index 62c1faa..d314641 100644
--- a/vim/mySnippets/cpp.snippets
+++ b/vim/mySnippets/cpp.snippets
@@ -1,10 +1,35 @@
 snippet print_mat "Print matrix" b
-for (unsigned int iii = 0; iii < ${0:mat}.size(); ++iii) {
-	cout << setw(12) << mat[iii][0];
-	for (unsigned int jjj = 1; jjj < mat.size(); ++jjj) {
+for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
+	cout << setw(12) << $1[iii][0];
+	for (unsigned int jjj = 1; jjj < $1.size(); ++jjj) {
 		cout << ", ";
-		cout << setw(12) << mat[iii][jjj];
+		cout << setw(12) << $1[iii][jjj];
 	}
 	cout << endl;
 }
+$0
+endsnippet
+
+snippet print_vec "Print vector" b
+for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
+	cout << setw(12) << $1[iii];
+	cout << endl;
+}
+$0
+endsnippet
+
+snippet forij "Matrix iteration" b
+for (int ${2:i} = 0; $2 < ${1:count}; $2++) {
+	for (int ${4:j} = 0; $4 < $1; $4++) {
+		${5}
+	}
+}
+endsnippet
+
+snippet vec "vector" i
+vector<${1:double}> $0
+endsnippet
+
+snippet mat "matrix" i
+vector< vector<${1:double}> > $0
 endsnippet
diff --git a/vim/mySnippets/mail.snippets b/vim/mySnippets/mail.snippets
index c512f9b..9839916 100644
--- a/vim/mySnippets/mail.snippets
+++ b/vim/mySnippets/mail.snippets
@@ -15,7 +15,9 @@ ${3:Urbain}
 endsnippet
 
 snippet sign "Signature" b
-Urbain Vaes,
+Best wishes,
+
+Urbain Vaes
 Department of Mathematics
 Office 6M09
 endsnippet
diff --git a/vim/mySnippets/python.snippets b/vim/mySnippets/python.snippets
index e69de29..4a7d74d 100644
--- a/vim/mySnippets/python.snippets
+++ b/vim/mySnippets/python.snippets
@@ -0,0 +1,4 @@
+snippet nicolas "Nicolas" i
+Nicolas est le meilleur programmeur $1
+$0
+endsnippet
diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index fb061f0..884cc2d 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -15,7 +15,7 @@ snippet new "New command" b
 endsnippet
 
 snippet op "Operator style" i
-\op 
+\op
 endsnippet
 
 snippet pard "Partial derivative" i
@@ -27,7 +27,7 @@ snippet pardd "Double partial derivative" i
 endsnippet
 
 snippet herm "Hermite polynomials" i
-\hermite 
+\hermite
 endsnippet
 
 snippet red "Red text" i
@@ -39,35 +39,35 @@ snippet sumi "Sum over index set" i
 endsnippet
 
 snippet int "Integral" i
-\int_{$1} 
+\int_{$1}
 endsnippet
 
 snippet ip "Inner product" i
 \ip{$1}{$2}$0
 endsnippet
 
-snippet norm "Norm" i
-\norm{$1}$0
+snippet ipw "Inner product" i
+\wip{$1}{$2}{$3}$0
 endsnippet
 
-snippet test "Test functions" i
-\test{${1:\real^n}}$0
+snippet norm "Norm" i
+\norm{$1}$0
 endsnippet
 
-snippet lp "Flat Lp space" i
-\lp{${1:2}}{${2:\real^n}}$0
+snippet normw "Weighted norm" i
+\wnorm{$1}{${2:\gamma}}
 endsnippet
 
-snippet lpw "Weighted Lp space" i
-\wlp{${1:2}}{${2:\real^n}}{${3:\rho}}$0
+snippet test "Test functions" i
+\test{${1:\real^n}}$0
 endsnippet
 
-snippet sob "Flat Sobolev space" i
-\sobolev{${1:s}}{${2:\real^n}}$0
+snippet lp "Lp spaces" w
+\lp{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
 endsnippet
 
-snippet sobw "Weighted Sobolev space" i
-\wsobolev{${1:s}}{${2:\real^n}}{${3:\rho}}$0
+snippet  sob "Sobolev spaces" w
+\sobolev{${1:exponent}}{${2:domain}}${3/^.+$/[/}${3:weight}${3/^.+$/]/}$0
 endsnippet
 
 snippet cont "Continuous function" i
@@ -101,3 +101,10 @@ endsnippet
 snippet ref "Clever reference" i
 \cref{$1}$0
 endsnippet
+
+snippet frame "My frame snippet" b
+\begin{frame}
+	\frametitle{$1}
+	$0
+\end{frame}
+endsnippet
diff --git a/vimrc b/vimrc
index 9973b88..526bab5 100644
--- a/vimrc
+++ b/vimrc
@@ -1,59 +1,60 @@
-"" Required by vundle
-set nocompatible
-filetype off
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
-
 "" Plugins
-Plugin 'gmarik/vundle'
-Plugin 'airblade/vim-gitgutter'
-Plugin 'altercation/vim-colors-solarized'
-Plugin 'bling/vim-airline'
-Plugin 'christoomey/vim-tmux-navigator'
-Plugin 'edkolev/tmuxline.vim'
-Plugin 'freeo/vim-kalisi'
-Plugin 'godlygeek/tabular'
-Plugin 'gregsexton/gitv'
-Plugin 'honza/vim-snippets'
-Plugin 'jamessan/vim-gnupg'
-Plugin 'junegunn/seoul256.vim'
-Plugin 'junegunn/fzf' 
-Plugin 'AndrewRadev/splitjoin.vim'
-Plugin 'kien/ctrlp.vim'
-Plugin 'LaTeX-Box-Team/latex-box'
-Plugin 'majutsushi/tagbar'
-Plugin 'mileszs/ack.vim'
-Plugin 'rdnetto/YCM-Generator'
-Plugin 'scrooloose/nerdtree'
-Plugin 'scrooloose/syntastic'
-Plugin 'SirVer/ultisnips'
-Plugin 'sjl/Gundo.vim'
-Plugin 'szw/vim-ctrlspace'
-Plugin 'terryma/vim-multiple-cursors'
-Plugin 'tomasr/molokai'
-Plugin 'tommcdo/vim-exchange'
-Plugin 'ton/vim-bufsurf'
-Plugin 'tpope/vim-abolish'
-Plugin 'tpope/vim-commentary'
-Plugin 'tpope/vim-fugitive'
-Plugin 'tpope/vim-obsession'
-Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-scriptease'
-Plugin 'tpope/vim-sensible'
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-unimpaired'
-Plugin 'troydm/zoomwintab.vim'
-Plugin 'Valloric/YouCompleteMe'
-
-filetype plugin indent on
-syntax on
-
-"" Plugins options
-
-let g:LatexBox_Folding=0
-let g:LatexBox_latexmk_preview_continuously=1
-let g:LatexBox_quickfix=2
-let g:LatexBox_viewer='zathura'
+call plug#begin('~/.vim/plugged')
+Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' }
+Plug 'altercation/vim-colors-solarized'
+Plug 'AndrewRadev/splitjoin.vim'
+Plug 'beloglazov/vim-online-thesaurus'
+Plug 'benekastah/neomake' , { 'for' : 'cpp' }
+Plug 'bling/vim-airline'
+Plug 'christoomey/vim-tmux-navigator'
+Plug 'freeo/vim-kalisi'
+Plug 'godlygeek/tabular' , { 'on' : 'Tab' }
+Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
+Plug 'honza/vim-snippets'
+Plug 'itchyny/calendar.vim', { 'on' : 'Calendar' }
+Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
+Plug 'junegunn/fzf'
+Plug 'junegunn/seoul256.vim'
+Plug 'junegunn/vim-pseudocl'
+Plug 'junegunn/vim-oblique'
+Plug 'junegunn/vim-peekaboo'
+Plug 'junegunn/rainbow_parentheses.vim'
+Plug 'justinmk/vim-sneak'
+Plug 'kassio/neoterm', { 'on' : 'T' }
+Plug 'kien/ctrlp.vim'
+Plug 'lervag/vimtex' ", { 'for' : 'tex' }
+Plug 'majutsushi/tagbar'
+Plug 'mileszs/ack.vim', { 'on' : 'Ack' }
+Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' }
+Plug 'ryanss/vim-hackernews', { 'on' : 'HackerNews' }
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
+Plug 'scrooloose/syntastic'
+Plug 'SirVer/ultisnips'
+Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
+Plug 'terryma/vim-multiple-cursors'
+Plug 'tomasr/molokai'
+Plug 'tommcdo/vim-exchange'
+Plug 'ton/vim-bufsurf'
+Plug 'tpope/vim-abolish', { 'for' : 'tex' }
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-git'
+Plug 'tpope/vim-obsession'
+Plug 'tpope/vim-repeat'
+Plug 'tpope/vim-sensible'
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-unimpaired'
+Plug 'troydm/zoomwintab.vim'
+Plug 'Valloric/YouCompleteMe'
+", { 'do' : './install.sh --clang-completer' }
+Plug 'xolox/vim-misc', { 'on' : 'Note' }
+Plug 'xolox/vim-notes', { 'on' : 'Note' }
+call plug#end()
+
+let g:vimtex_fold_enabled=0
+let g:vimtex_view_method='zathura'
+let g:vimtex_latexmk_continuous=1
+let g:vimtex_quickfix_mode=0
 
 let g:UltiSnipsEditSplit="horizontal"
 let g:UltiSnipsExpandTrigger="<tab>"
@@ -61,14 +62,14 @@ let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
 let g:UltiSnipsJumpForwardTrigger="<tab>"
 let g:UltiSnipsListSnippets="<c-l>"
 let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
-let g:UltiSnipsSnippetsDir="~/.nvim/mySnippets"
+let g:UltiSnipsSnippetsDir="~/.vim/mySnippets"
 
 let g:airline_left_sep=''
 let g:airline_right_sep=''
 let g:airline_section_c = '%f%m'
 let g:airline_section_y = ''
 let g:airline_section_z = '%3p%%|%3l|%3c'
-let g:airline_theme='base16'
+let g:airline_theme='solarized'
 let g:airline#extensions#tabline#enabled = 0
 let g:airline_exclude_preview = 0
 
@@ -78,9 +79,8 @@ let g:bufferline_echo = 0
 let g:bufferline_modified = '+'
 let g:bufferline_rotate = 0
 
-nnoremap <a-p> :CtrlPMRUFiles<cr>
 let g:ctrlp_by_filename = 1
-let g:ctrlp_cmd = 'CtrlPBuffer'
+let g:ctrlp_cmd = 'CtrlP'
 let g:ctrlp_map = '<c-p>'
 let g:ctrlp_open_new_file = 't'
 let g:ctrlp_show_hidden = 1
@@ -94,17 +94,16 @@ let g:ctrlp_prompt_mappings = {
 
 let g:syntastic_cpp_compiler = "g++"
 let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
+let g:syntastic_error_symbol = "✗"
+let g:syntastic_warning_symbol = "W"
 
 let g:tagbar_width = 30
 let g:tagbar_show_linenumbers=1
+let g:tagbar_autofocus=1
 
 let g:tex_conceal= 'adgm'
 let g:tex_flavor='latex'
-let g:tex_fast=""
-
-let g:tmuxline_preset = {'a':'#H','b':'#S','win':'#W','cwin':'#W','x':'%R','y':'%a','z':'%Y'}
-let g:tmuxline_separators = {'left':'','left_alt':'>','right':'','right_alt':'<','space':' '}
-let g:tmuxline_theme='airline'
+let g:tex_fast=1
 
 let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
             \ '\.fls$','\.bbl$','\.blg$',
@@ -113,8 +112,17 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
 
 let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
+let g:ycm_add_preview_to_completeopt = 0
+let g:ycm_confirm_extra_conf = 0
 let g:ycm_auto_trigger = 1
-let g:ycm_confirm_extra_conf = 1
+if !exists('g:ycm_semantic_triggers')
+    let g:ycm_semantic_triggers = {}
+endif
+let g:ycm_semantic_triggers.tex = ['re!\\[A-Za-z]*(ref|cite)[A-Za-z]*([^]]*])?{([^}]*, ?)*' ]
+
+let g:calendar_google_calendar = 1
+let g:calendar_google_task = 1
+
 
 "" Vim options
 
@@ -139,10 +147,11 @@ set undodir=/home/urbain/.nvim/vimundo/
 
 " Layout window
 set nonumber
+set diffopt=filler,vertical
 set listchars=tab:▸\ ,eol:¬,trail:-
 set fillchars=fold:\ ,vert:\ ,
-set showbreak=--▸\ ,
 set breakindent
+let &showbreak='--> '
 set colorcolumn=0
 set scrolloff=0
 set t_Co=256
@@ -154,7 +163,7 @@ set nowrap
 set linebreak
 set textwidth=0
 set conceallevel=2
-set formatprg=par\ w70
+set formatprg=par\ w72
 set guifont=Monaco\ 11
 
 " Case and spell
@@ -173,7 +182,7 @@ set lazyredraw
 set hidden
 
 " Colorscheme
-try | colorscheme solarized | catch | endtry
+silent! colo solarized
 highlight Comment cterm=italic
 set t_ZH=
 set t_ZR=
@@ -191,17 +200,19 @@ nnoremap <Leader>pn :tabnew<cr>
 nnoremap <Leader>po :tabonly<cr>
 
 " Plugin Management
-nnoremap <Leader>pi :PluginInstall<cr>
-nnoremap <Leader>pu :PluginUpdate<cr>
-nnoremap <Leader>pc :PluginClean<cr>
-nnoremap <Leader>ps :PluginSearch<cr>
+nnoremap <Leader>pi :PlugInstall<cr>
+nnoremap <Leader>pu :PlugUpdate<cr>
+nnoremap <Leader>pc :PlugClean<cr>
+nnoremap <Leader>pd :PlugDiff<cr>
+nnoremap <Leader>ps :PlugStatus<cr>
 
 " Toggles
 nnoremap cop :set paste!<cr>
-nnoremap <Leader>tg :GitGutterToggle<cr>
-nnoremap <Leader>tn :NERDTreeToggle<cr>
-nnoremap <Leader>tt :TagbarToggle<cr>
-nnoremap <Leader>tu :GundoToggle<cr>
+nnoremap cof :set foldenable!<cr>
+nnoremap cpg :GitGutterToggle<cr>
+nnoremap cpn :NERDTreeToggle<cr>
+nnoremap cpt :TagbarToggle<cr>
+nnoremap cpu :GundoToggle<cr>
 
 " Sourcing
 nnoremap <Leader>sv :source ~/.vimrc<cr>
@@ -231,6 +242,7 @@ nnoremap <s-Return> O<Esc>
 nnoremap <Leader>gs :Gstatus<cr>
 nnoremap <Leader>gr :Gread<cr>
 nnoremap <Leader>gd :Gdiff<cr>
+nnoremap <Leader>gv :Gitv<cr>
 
 " Misc
 nnoremap <tab> <C-^>
@@ -241,6 +253,7 @@ nnoremap <LocalLeader>h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp,<CR>
 nnoremap J mzJ`z
 nnoremap Y y$
 nnoremap + za
+nnoremap K :OnlineThesaurusCurrentWord<CR>
 
 " Dvorak specific
 nnoremap : ,
@@ -248,15 +261,37 @@ vnoremap : ,
 nnoremap , :
 vnoremap , :
 
-"" Experimental
-augroup cursorPosition
+" Neovim specific
+if has("nvim")
+    tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
+    nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
+    inoremap <C-_> <Esc>:b term<cr>i
+    nnoremap ym :Neomake!<cr>
+endif
+
+"" Restore cursor position
+augroup vimrc
     au!
+    autocmd BufWritePost *vimrc source %
+    autocmd BufWritePost *.cpp Neomake!
     autocmd BufReadPost *
                 \ if line("'\"") > 1 && line("'\"") <= line("$") |
                 \   exe "normal! g`\"" |
                 \ endif
 augroup END
 
-if has('nvim')
-    tmap jk <C-\><C-n>
-endif
+"" Taken from Junegunn Chong
+nnoremap <silent> <Leader>C :call fzf#run({
+\   'source':
+\     map(split(globpath(&rtp, "colors/*.vim"), "\n"),
+\         "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"),
+\   'sink':     'colo',
+\   'options':  '+m',
+\   'left':     30,
+\   'launcher': 'iterm2-launcher 20 30 %s'
+\ })<CR>
+
+"" Experimental
+let g:notes_directories = ['~/dotfiles/notes']
+
+" Idea: instant download colorscheme