Merge branch 'master' of urbainvaes.com:git/dotfiles

9 files changed, 19 insertions, 54 deletions

diff --git a/.vim/after/ftplugin/tex/folding.vim b/.vim/after/ftplugin/tex/folding.vim
deleted file mode 100644
index e69de29..0000000
--- a/.vim/after/ftplugin/tex/folding.vim
+++ /dev/null
diff --git a/.vim/after/ftplugin/tex/mappings.vim b/.vim/after/ftplugin/tex/mappings.vim
index f812cd8..1c4625d 100644
--- a/.vim/after/ftplugin/tex/mappings.vim
+++ b/.vim/after/ftplugin/tex/mappings.vim
@@ -1,14 +1,14 @@
-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> (( \left(
+iabbrev <buffer> )) \right)
+iabbrev <buffer> {{ \left\{
+iabbrev <buffer> }} \right\}
+iabbrev <buffer> [[ \left[
+iabbrev <buffer> ]] \right]
+iabbrev <buffer> == \,=\,
+iabbrev <buffer> >> \,\geq\,
+iabbrev <buffer> << \,\leq\,
+iabbrev <buffer> ++ \,+\,
+iabbrev <buffer> -- \,-\,
 
 iabbrev <buffer> ga \alpha
 iabbrev <buffer> gb \beta
@@ -29,7 +29,6 @@ iabbrev <buffer> gs \sigma
 iabbrev <buffer> gf \phi
 iabbrev <buffer> gp \pi
 iabbrev <buffer> gw \omega
-iabbrev <buffer> dd \d
 
 nnoremap <buffer> <LocalLeader>i :VimtexCompile<CR>
 nnoremap <buffer> <LocalLeader>e :VimtexErrors<CR>
diff --git a/.vim/after/syntax/cpp.vim b/.vim/after/syntax/cpp.vim
deleted file mode 100644
index 4da741d..0000000
--- a/.vim/after/syntax/cpp.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-syntax keyword mPigroup pi
-hi def link mPigroup Todo
-
diff --git a/.vim/after/syntax/cpp.vim~ b/.vim/after/syntax/cpp.vim~
deleted file mode 100644
index e69de29..0000000
--- a/.vim/after/syntax/cpp.vim~
+++ /dev/null
diff --git a/.vim/after/syntax/tex.vim b/.vim/after/syntax/tex.vim
deleted file mode 100644
index a40cc30..0000000
--- a/.vim/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/.vim/after/syntax/tex.vim~ b/.vim/after/syntax/tex.vim~
deleted file mode 100644
index 4e1d112..0000000
--- a/.vim/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/.vim/colors/mine.vim b/.vim/colors/mine.vim
index 653682e..25d8a97 100644
--- a/.vim/colors/mine.vim
+++ b/.vim/colors/mine.vim
@@ -1,29 +1,6 @@
-" 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=dark
 
-set background=light
 hi clear
-if exists("syntax_on")
-   syntax reset
-endif
+syntax reset
 
-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
+hi Error ctermbg=None
diff --git a/.vim/init.vim b/.vim/init.vim
new file mode 120000
index 0000000..c9a3c9c
--- /dev/null
+++ b/.vim/init.vim
@@ -0,0 +1 @@
+vimrc
\ No newline at end of file
diff --git a/.vim/vimrc b/.vim/vimrc
index f1c9dcb..ef7be30 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -184,9 +184,12 @@ if $COLORSCHEME=="light"
 elseif $COLORSCHEME=="dark"
     silent! colo solarized
     set background=dark
-elseif $COLORSCHEME=="default"
+elseif $COLORSCHEME=="seoul"
     silent! colo seoul256
     set background=dark
+else
+    silent! colo solarized
+    set background=dark
 endif
 
 highlight Comment cterm=italic