resolving conflicts

7 files changed, 71 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index 004d84e..78dfac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ mutt/mutt-colors-solarized/
 mutt/temp/
 passwords
 mutt/cache/
+mutt/cache/headers/
diff --git a/mutt/cache/headers b/mutt/cache/headers
new file mode 100644
index 0000000..76ae554
--- /dev/null
+++ b/mutt/cache/headers
diff --git a/mutt/mailboxes b/mutt/mailboxes
index d259b41..9e64508 100644
--- a/mutt/mailboxes
+++ b/mutt/mailboxes
@@ -1 +1 @@
-mailboxes "+Gmail/Gmail" "+Hotmail/Hotmail" "+Imperial/Imperial" "+Main/Drafts" "+Main/Main" "+Main/Sent"
+mailboxes "+Hotmail/Hotmail" "+Main/Drafts" "+Main/Main" "+Main/Sent" "+Gmail/Gmail" "+Imperial/Imperial"
diff --git a/mutt/muttrc b/mutt/muttrc
index 00ceec1..71d5d84 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -77,8 +77,9 @@ set sort         = threads
 set sort_aux     = reverse-last-date-received
 set sort_browser = reverse-date
 
-# Colorscheme for inside mutt
+# Files to source
 source `sh /home/urbain/.mutt/colormutt`
+source ~/.mutt/alias
 
 # HTML messages
 auto_view text/html
diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index a1064ea..9c2153e 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -1,3 +1,51 @@
+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
+\pard{$1}{$2} $0
+endsnippet
+
+snippet pardd "Double partial derivative" i
+\pardd{$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 ip "Inner product" i
+\ip{$1}{$2} $0
+endsnippet
+
+snippet norm "Norm" i
+\norm{$1} $0
+endsnippet
+
 snippet test "Test functions" i
 \test{${1:\real^n}} $0
 endsnippet
diff --git a/vim/vimrc b/vim/vimrc
index 08bf19e..33c095a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -53,7 +53,7 @@ let g:LatexBox_quickfix=2
 function! SynctexShow()
     let synctex = glob("*.synctex.gz")
     if strlen(synctex) == 0
-        echo "no synctex file found"
+        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))
@@ -61,16 +61,10 @@ function! SynctexShow()
     end
 endfunction
 
-" Access
 nnoremap <LocalLeader>a :call SynctexShow()<CR><CR>
-
-" Initiate
 nnoremap <LocalLeader>i :Latexmk<CR>
-
-" Open
+nnoremap <LocalLeader>e :LatexErrors<CR>
 nnoremap <LocalLeader>o :LatexView<CR>
-
-" Kill
 nnoremap <LocalLeader>k :LatexmkStop<CR>:LatexmkClean<CR>
 
 "  Gundo
@@ -100,7 +94,7 @@ set tabstop=4
 set softtabstop=4
 set shiftwidth=4
 set autoindent
-set breakindent
+" set breakindent
 " set cindent
 
 "  Folds
@@ -143,7 +137,6 @@ set textwidth=0
 set conceallevel=2
 set guifont=Monaco\ 11
 
-
 "  Case and spell
 set nospell
 set smartcase
@@ -158,14 +151,12 @@ set encoding=utf-8
 ""  Colorscheme
 function! UpdateColorscheme()
     try | colorscheme solarized | catch | endtry
-    if strftime("%H") >= 9 && strftime("%H") < 17
+    if strftime("%H") >= 9 && strftime("%H") < 18
         set background=light
     else
         set background=dark
     endif
 
-    echom
-
     hi Cursor guifg=white guibg=blue
     hi iCursor guifg=black guibg=green
     hi! link conceal normal
@@ -190,6 +181,8 @@ nnoremap <Leader>sc :source %
 nnoremap <Return> o<Esc>
 nnoremap <s-Return> O<Esc>
 nnoremap J mzJ`z
+nnoremap Y y$
+
 " nnoremap - za
 nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>
@@ -223,13 +216,6 @@ nmap <buffer> <F2> <Plug>LatexChangeEnv
 let g:tex_fast=""
 autocmd Filetype tex call SetTexOptions()
 
-
-""  Functions
-function! Tex_ForwardSearchLaTeX()
-    let cmd = 'evince_forward_search ' . fnamemodify(LatexBox_GetMainTexFile(), ":p:r") .  '.pdf ' . line(".") . ' ' . expand("%:p")
-    let output = system(cmd)
-endfunction
-
 function! SetTexOptions()
 
     inoremap (( \left(
diff --git a/zshrc b/zshrc
index 38b3185..e97b90d 100644
--- a/zshrc
+++ b/zshrc
@@ -39,9 +39,9 @@ alias -s py=vim
 # Directories
 alias u='cd ~/Dropbox/phd'
 alias uc='cd ~/Dropbox/phd/programs'
-alias up='cd ~/Dropbox/phd/presentations'
 alias ul='cd ~/Dropbox/phd/literature'
 alias ur='cd ~/Dropbox/phd/reports'
+alias up='cd ~/Dropbox/phd/presentations'
 alias papers='cd ~/Dropbox/phd/papers'
 alias books='cd ~/Dropbox/phd/books'
 alias cdd='cd ~/dotfiles'
@@ -79,18 +79,18 @@ bindkey -a 'k' history-beginning-search-backward
 bindkey -a 'j' history-beginning-search-forward
 
 # Colorscheme
-sleep 2
-h=`date +%H`
-if [ $h -lt 9 ]; then
-    xdotool key Alt+t p Down Right Return
-    eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
-elif [ $h -lt 17 ]; then
-    xdotool key Alt+t p Down Down Right Return
-    eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-light`
-else
-    xdotool key Alt+t p Down Right Return
-    eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
-fi
+# sleep 2
+# h=`date +%H`
+# if [ $h -lt 9 ]; then
+#     xdotool key Alt+t p Down Right Return
+#     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
+# elif [ $h -lt 17 ]; then
+#     xdotool key Alt+t p Down Down Right Return
+#     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-light`
+# else
+#     xdotool key Alt+t p Down Right Return
+#     eval `dircolors ~/.solarized/dircolors-solarized/dircolors.ansi-dark`
+# fi
 
 # Crontab jobs
 crontab ~/dotfiles/crontab