Merge vim and neovim configs

6 files changed, 82 insertions, 35 deletions

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