Merge branch 'master' of github.com:uvaes/dotfiles

Conflicts:
	vim/mySnippets/tex.snippets

10 files changed, 62 insertions, 18 deletions

diff --git a/mutt/muttrc b/mutt/muttrc
index 0418afe..23755f1 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -56,9 +56,9 @@ set include=yes
 set sendmail="/usr/bin/msmtp"
 
 # Sorting options
-set sort         = threads
+# set sort         = threads
 set sort_aux     = reverse-last-date-received
-set sort_browser = reverse-date
+# set sort_browser = reverse-date
 
 # Alias file
 source ~/.mutt/alias
@@ -82,3 +82,15 @@ bind   pager   \Cy  previous-line
 bind   pager   j    next-entry
 bind   pager   k    previous-entry
 bind   pager   R    group-reply
+
+# Colors
+color index brightblue color0 "~f edfenergy"
+color index brightblue color0 "~f terravision"
+color index magenta color0 "~f avaaz"
+color index green color0 "~f vaes"
+color index blue color0 "~f pavliotis"
+color index blue color0 "~f abdulle"
+color index magenta color0 "~f santos"
+color index magenta color0 "~f rusudan"
+color index red color0 "~F"
+color index cyan color0 "~U"
diff --git a/vim/.netrwhist b/vim/.netrwhist
new file mode 100644
index 0000000..87b6bdf
--- /dev/null
+++ b/vim/.netrwhist
@@ -0,0 +1,5 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/code/spectral/feature'
+let g:netrw_dirhist_2='/home/urbain/Dropbox/phd/code/spectral/feature/src'
+let g:netrw_dirhist_3='/home/urbain/Dropbox/phd/code/spectral/develop/python'
diff --git a/vim/mySnippets/python.snippets b/vim/mySnippets/python.snippets
index 4a7d74d..6dbc272 100644
--- a/vim/mySnippets/python.snippets
+++ b/vim/mySnippets/python.snippets
@@ -1,4 +1,4 @@
-snippet nicolas "Nicolas" i
-Nicolas est le meilleur programmeur $1
-$0
+snippet fori "for loop over range" b
+for ${1:i} in range(${2:n}):
+	${0:pass}
 endsnippet
diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index 0a7c9a3..9c74845 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -106,5 +106,5 @@ snippet frame "My frame snippet" b
 endsnippet
 
 snippet gauss "Gaussian density" w
-\gaussian{${1:\mu}}{${2:\Sigma}}
+\gaussian{${1:\mu}}{${2:\Sigma}}$0
 endsnippet
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 1d49910..460c1ea 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -1,3 +1,28 @@
 Plugin
 Colorscheme
 vim
+multiscale
+SDEs
+SPDEs
+Abdulle
+Pavliotis
+Ornstein
+Uhlenbeck
+MRes
+Galerkin
+ODEs
+PDEs
+Kolmogorov
+SDE
+Maruyama
+advective
+eqref
+Milgram
+Cea's
+Lyapunov
+Gnuplot
+Cholesky
+Assyr
+EPFL
+SymPy
+CMake
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index d34ca08..a300e1e 100644
--- a/vim/spell/en.utf-8.add.spl
+++ b/vim/spell/en.utf-8.add.spl
diff --git a/vim/spell/en.utf-8.spl b/vim/spell/en.utf-8.spl
new file mode 100644
index 0000000..a41bf79
--- /dev/null
+++ b/vim/spell/en.utf-8.spl
diff --git a/vim/spell/en.utf-8.sug b/vim/spell/en.utf-8.sug
new file mode 100644
index 0000000..b82667d
--- /dev/null
+++ b/vim/spell/en.utf-8.sug
diff --git a/vimrc b/vimrc
index 526bab5..e8a6886 100644
--- a/vimrc
+++ b/vimrc
@@ -12,6 +12,7 @@ Plug 'godlygeek/tabular' , { 'on' : 'Tab' }
 Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
 Plug 'itchyny/calendar.vim', { 'on' : 'Calendar' }
+Plug 'klen/python-mode'
 Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
 Plug 'junegunn/fzf'
 Plug 'junegunn/seoul256.vim'
@@ -37,6 +38,7 @@ Plug 'tommcdo/vim-exchange'
 Plug 'ton/vim-bufsurf'
 Plug 'tpope/vim-abolish', { 'for' : 'tex' }
 Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-flagship'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-git'
 Plug 'tpope/vim-obsession'
@@ -44,9 +46,9 @@ Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
+Plug 'tpope/vim-vinegar'
 Plug 'troydm/zoomwintab.vim'
-Plug 'Valloric/YouCompleteMe'
-", { 'do' : './install.sh --clang-completer' }
+Plug 'Valloric/YouCompleteMe', { 'do' : './install.sh --clang-completer' }
 Plug 'xolox/vim-misc', { 'on' : 'Note' }
 Plug 'xolox/vim-notes', { 'on' : 'Note' }
 call plug#end()
@@ -92,6 +94,8 @@ let g:ctrlp_prompt_mappings = {
     \ 'PrtHistory(-1)':       ['<c-j>'],
     \ 'PrtHistory(1)':        ['<c-k>'],}
 
+let g:pymode_rope=0
+
 let g:syntastic_cpp_compiler = "g++"
 let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
 let g:syntastic_error_symbol = "✗"
@@ -101,9 +105,10 @@ 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=1
+" let g:tex_fast=1
 
 let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
             \ '\.fls$','\.bbl$','\.blg$',
@@ -123,6 +128,8 @@ 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
 
+let g:tabprefix = ""
+
 
 "" Vim options
 
@@ -168,7 +175,7 @@ set guifont=Monaco\ 11
 
 " Case and spell
 set nospell
-set spellfile="/home/urbain/.vim/spell/en.utf-8.add"
+" set spellfile="/home/urbain/.vim/spell/en.utf-8.add"
 set smartcase
 set ignorecase
 
diff --git a/zshrc b/zshrc
index 875ffc6..8cabc2a 100644
--- a/zshrc
+++ b/zshrc
@@ -48,28 +48,23 @@ alias a='vifm'
 alias c='clear'
 alias ca='printf "\ec"'
 alias commit='git commit -a -m'
-alias e=$EDITOR
 alias g='git'
-alias gco='git checkout'
 alias install='sudo apt-get install'
 alias m='mutt'
 alias mail='offlineimap -u quiet &'
 alias mc='make clean'
-alias mn="$EDITOR ~/.mynotes"
 alias n='nvim'
-alias ns="$EDITOR --servername SYNC"
-alias nsess="$EDITOR -S Session.vim"
+alias ns="$EDITOR -S Session.vim"
 alias pull='git pull origin master'
-alias purge='sudo apt-get purge'
 alias push='git push origin master'
 alias pushs='git push --recurse-submodules=check'
-alias remove='sudo apt-get autoremove'
-# alias tmux="TERM=screen-256color-bce tmux"
 alias update='sudo apt-get update'
 alias upgrade='sudo apt-get upgrade'
 alias v='vim'
 alias x='sh ~/.xmodmap'
 alias xcape='/home/urbain/xcape/xcape'
+alias light='xrdb ~/.Xresources.light'
+alias dark='xrdb ~/.Xresources.dark'
 
 # Configuration
 alias em="$EDITOR ~/.mutt/muttrc"