summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--header.tex27
-rwxr-xr-xmake6
-rw-r--r--mutt/cache/headersbin777472 -> 0 bytes
-rw-r--r--vifm/Trashbin98630 -> 0 bytes
-rw-r--r--vim/mySnippets/tex.snippets4
-rw-r--r--vim/vimrc37
-rw-r--r--zshrc24
8 files changed, 28 insertions, 72 deletions
diff --git a/.gitignore b/.gitignore
index aeaf3d3..577cfc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ vifm/Trash/
mutt/mutt-colors-solarized/
mutt/temp/
passwords
+mutt/cache/
+mutt/cache/headers
diff --git a/header.tex b/header.tex
deleted file mode 100644
index 0c654ab..0000000
--- a/header.tex
+++ /dev/null
@@ -1,27 +0,0 @@
-% Macros
-\definecolor{darkred}{rgb}{.7,0,0}
-\newcommand{\real}[0]{\mathbf R}
-\newcommand{\nat}[0]{\mathbf N}
-\newcommand{\op}[0]{\mathcal}
-\newcommand{\grad}[0]{\nabla}
-\newcommand{\dive}[0] {\,\nabla\,\cdot\,}
-\newcommand{\ip}[2]{\left \langle #1,#2 \right\rangle}
-\newcommand{\norm}[1]{\left\| #1 \right\|}
-\newcommand{\pard}[2]{\partial_{#2} #1}
-\newcommand{\pardl}[2]{\frac{\partial #1}{\partial #2}}
-\newcommand{\pardd}[2]{\partial_{#2}^2 #1}
-\newcommand{\parddl}[2]{\frac{\partial^2 #1}{\partial #2^2}}
-\newcommand{\dd}[0]{\,\mathrm d}
-\newcommand{\hermite}[0]{\mathcal}
-\newcommand{\gaussian}[1]{g_{#1}}
-\newcommand{\stdgaussian}[0]{g}
-\newcommand{\test}[1]{C^\infty_c(#1)}
-\newcommand{\flp}[2]{L^{#1}(#2)}
-\newcommand{\wlp}[3]{L^{#1}(#2,#3)}
-\newcommand{\sobolev}[2]{H^{#1}(#2)}
-\newcommand{\wsobolev}[3]{H^{#1}(#2, #3)}
-\newcommand{\red}[1]{\textcolor{darkred}{#1}}
-\newcommand{\HRule}{\rule{\linewidth}{0.5mm}}
-\newcommand{\smooth}[1]{C^\infty(#1)}
-\newcommand{\cont}[2]{C^{#1}(#2)}
-\newcommand{\Space}[0]{\mathscr}
diff --git a/make b/make
index b66a6c1..7836cb4 100755
--- a/make
+++ b/make
@@ -1,10 +1,10 @@
#!/bin/bash
-dir=~/dotfiles
-olddir=~/dotfiles_old
+dir=~/Dropbox/dotfiles
+olddir=~/Dropbox/dotfiles_old
# Files to sync
-files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc inputrc latexmkrc crontab krystle"
+files="vim mutt vifm bashrc zshrc xmodmap mynotes tmux.conf zathurarc offlineimaprc inputrc latexmkrc crontab gitconfig"
rm -rf $olddir
mkdir -p $olddir
diff --git a/mutt/cache/headers b/mutt/cache/headers
deleted file mode 100644
index 3b47717..0000000
--- a/mutt/cache/headers
+++ /dev/null
Binary files differ
diff --git a/vifm/Trash b/vifm/Trash
deleted file mode 100644
index 12c6f49..0000000
--- a/vifm/Trash
+++ /dev/null
Binary files differ
diff --git a/vim/mySnippets/tex.snippets b/vim/mySnippets/tex.snippets
index 0fba4e8..fb061f0 100644
--- a/vim/mySnippets/tex.snippets
+++ b/vim/mySnippets/tex.snippets
@@ -97,3 +97,7 @@ endsnippet
snippet cont "Continuous function" i
\cont{$1}{$2} $0
endsnippet
+
+snippet ref "Clever reference" i
+\cref{$1}$0
+endsnippet
diff --git a/vim/vimrc b/vim/vimrc
index bef1eb2..ed6e0c0 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -7,8 +7,9 @@ call vundle#rc()
"" Plugins
Plugin 'gmarik/vundle'
-Plugin 'LaTeX-Box-Team/latex-box'
+Plugin 'lervag/vimtex'
Plugin 'fugitive.vim'
+Plugin 'gregsexton/gitv'
Plugin 'UltiSnips'
Plugin 'kien/ctrlp.vim'
Plugin 'tpope/vim-surround'
@@ -43,29 +44,16 @@ let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets']
let g:ctrlp_open_new_file = 't'
noremap <c-h> :UltiSnipsEdit<Return>
-" Latex-Box
-let g:tex_flavor='latex'
-let g:tex_conceal= 'adgm'
-let g:LatexBox_Folding=0
-let g:LatexBox_viewer='zathura'
-let g:LatexBox_latexmk_preview_continuously=1
-let g:LatexBox_quickfix=2
-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
+let g:vimtex_fold_enabled=0
+let g:vimtex_view_method='zathura'
+let g:vimtex_latexmk_continuous=1
+let g:vimtex_quickfix_mode=2
-nnoremap <LocalLeader>a :call SynctexShow()<CR><CR>
-nnoremap <LocalLeader>i :Latexmk<CR>
-nnoremap <LocalLeader>e :LatexErrors<CR>
-nnoremap <LocalLeader>o :LatexView<CR>
-nnoremap <LocalLeader>k :LatexmkStop<CR>:LatexmkClean<CR>
+nnoremap <LocalLeader>i :VimtexCompile<CR>
+nnoremap <LocalLeader>e :VimtexErrors<CR>
+nnoremap <LocalLeader>v :VimtexView<CR>
+nnoremap <LocalLeader>k :VimtexStop<CR>:VimtexClean<CR>
+nnoremap <LocalLeader>t :VimtexTocToggle<CR>
nnoremap <LocalLeader>h :split header.sty<CR>
" Gundo
@@ -137,6 +125,9 @@ set linebreak
set textwidth=0
set conceallevel=2
set guifont=Monaco\ 11
+set lazyredraw
+highlight diffAdded guifg=#00bf00
+highlight diffRemoved guifg=#bf0000
" Case and spell
set nospell
diff --git a/zshrc b/zshrc
index 7a3f4b6..fe823d3 100644
--- a/zshrc
+++ b/zshrc
@@ -10,9 +10,6 @@ ENABLE_CORRECTION="true"
# Dots for completion
COMPLETION_WAITING_DOTS="true"
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
# Plugins
plugins=(vi-mode git)
@@ -44,7 +41,7 @@ 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'
+alias cdd='cd ~/Dropbox/dotfiles'
# Commands
alias tmux="TERM=screen-256color-bce tmux"
@@ -65,6 +62,9 @@ alias upgrade='sudo apt-get upgrade'
alias install='sudo apt-get install'
alias remove='sudo apt-get autoremove'
alias purge='sudo apt-get purge'
+alias push='git push origin master'
+alias pull='git pull origin master'
+alias commit='git commit -a -m "auto-commit"'
# Configuration
alias ez='vim ~/.zshrc'
@@ -80,19 +80,5 @@ alias ex='vim ~/.xmodmap'
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
-
# Crontab jobs
-crontab ~/dotfiles/crontab
+crontab ~/.crontab