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

Conflicts:
	vimrc

23 files changed, 239 insertions, 175 deletions

diff --git a/.gitignore b/.gitignore
index 567c7a1..67a599a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ mutt/mailboxes/
 mutt/mutt-colors-solarized/
 mutt/temp/
 newsbeuter
+nvim/netrwhist
 nvim/autoload/
 nvim/plugged/
 nvim/vim-plug/
diff --git a/README.md b/README.md
index 87377b4..b5fe2eb 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # dotfiles
 This repository contains my configuration files. I use the following programs:
-+ *vim* for text editing.
-+ *zathura* to preview pdf files.
++ *(neo)vim* for text editing.
++ *zathura* to view pdf files.
 + *offlineimap* + *mutt* + *msmtp* to receive, wirte, and send emails.
 + *zsh* with the *oh-my-zsh* framework as my shell. 
 
-All the configurations can be installed by executing the script install.sh. If used with arguments, only the files passed to the script will be installed. For example, executing
+All the configuration files can be installed by executing the script install.sh. If used with arguments, only the files passed to the script will be installed. For example, executing
 `./install.sh vim vimrc`
 will install my vim configuration.
diff --git a/ctags b/ctags
new file mode 100644
index 0000000..0c334fb
--- /dev/null
+++ b/ctags
@@ -0,0 +1,9 @@
+--langdef=latex
+--langmap=latex:.tex
+--regex-latex=/\\label\{([^}]*)\}/\1/l,label/
+--regex-latex=/\\section\{([^}]*)\}/\1/s,section/
+--regex-latex=/\\subsection\{([^}]*)\}/\1/t,subsection/
+--regex-latex=/\\subsubsection\{([^}]*)\}/\1/u,subsubsection/
+--regex-latex=/\\section\*\{([^}]*)\}/\1/s,section/
+--regex-latex=/\\subsection\*\{([^}]*)\}/\1/t,subsection/
+--regex-latex=/\\subsubsection\*\{([^}]*)\}/\1/u,subsubsection/
diff --git a/dircolors-solarized b/dircolors-solarized
new file mode 160000
+Subproject a21f4726bd214a96c76259b235c9a83854876e2
diff --git a/gitconfig b/gitconfig
index 4cf00e0..f1fffcd 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,3 +5,5 @@
 	templatedir = ~/.git_template
 [alias]
 	ctags = !.git/hooks/ctags
+[push]
+	default = simple
diff --git a/gnome-terminal-colors-solarized b/gnome-terminal-colors-solarized
new file mode 160000
+Subproject 8f981ec47c23cd1acbfdec0408d4b1ad92760f0
diff --git a/latexmkrc b/latexmkrc
index a76cf2b..1de49b4 100644
--- a/latexmkrc
+++ b/latexmkrc
@@ -1,4 +1,5 @@
 $pdf_mode = 1;
+$pdflatex = 'pdflatex --shell-escape';
 $pdf_previewer = 'zathura -s -x "vim --servername SYNC --remote +%{line} %{input}" %O %S';
 $clean_ext = "synctex.gz bbl pdf dvi";
 $new_viewer_always [0];
diff --git a/mutt-colors-solarized b/mutt-colors-solarized
new file mode 160000
+Subproject 3b23c55eb43849975656dd89e3f35dacd2b93e6
diff --git a/mutt/muttrc b/mutt/muttrc
index 2184667..711ae9e 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -62,7 +62,7 @@ set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 alternative_order text/plain text/enriched text/html
 
 # Email editing
-set editor="vim"
+set editor="nvim"
 set edit_headers
 set include=yes
 
diff --git a/notes/Personal notes b/notes/Personal notes
new file mode 100644
index 0000000..f129738
--- /dev/null
+++ b/notes/Personal notes
@@ -0,0 +1,26 @@
+Personal notes
+
+# Personal TODO list
+   • Message_Victor
+   • Prepare speech wedding
+   • Repay Arnaud
+
+                                     * * *
+
+# PhD TODO list
+   • 9 months report
+   • Article by Virginie
+
+                                     * * *
+
+# Admin
+   • Expense claims
+      ◦ Distribution textbook
+      ◦ Flight to Spain
+      ◦ Flight to Switzerland
+   • Invigilation
+
+                                     * * *
+
+# Useful info
+   • Bank number: 930630876
diff --git a/nvim/.netrwhist b/nvim/.netrwhist
new file mode 100644
index 0000000..f3dd887
--- /dev/null
+++ b/nvim/.netrwhist
@@ -0,0 +1,3 @@
+let g:netrw_dirhistmax  =10
+let g:netrw_dirhist_cnt =1
+let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/reports/mres'
diff --git a/nvim/mySnippets/cpp.snippets b/nvim/mySnippets/cpp.snippets
index 5ad9624..d314641 100644
--- a/nvim/mySnippets/cpp.snippets
+++ b/nvim/mySnippets/cpp.snippets
@@ -10,6 +10,22 @@ for (unsigned int iii = 0; iii < ${1:mat}.size(); ++iii) {
 $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
diff --git a/nvim/mySnippets/mail.snippets b/nvim/mySnippets/mail.snippets
index c512f9b..9839916 100644
--- a/nvim/mySnippets/mail.snippets
+++ b/nvim/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/nvim/spell/en.utf-8.spl b/nvim/spell/en.utf-8.spl
new file mode 100644
index 0000000..a41bf79
--- /dev/null
+++ b/nvim/spell/en.utf-8.spl
diff --git a/nvim/spell/en.utf-8.sug b/nvim/spell/en.utf-8.sug
new file mode 100644
index 0000000..b82667d
--- /dev/null
+++ b/nvim/spell/en.utf-8.sug
diff --git a/nvimrc b/nvimrc
index 44a70c0..3f7744f 100644
--- a/nvimrc
+++ b/nvimrc
@@ -3,23 +3,29 @@ call plug#begin('~/.nvim/plugged')
 Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' }
 Plug 'altercation/vim-colors-solarized'
 Plug 'AndrewRadev/splitjoin.vim'
-Plug 'benekastah/neomake'
+Plug 'benekastah/neomake' , { 'for' : 'cpp' }
 Plug 'bling/vim-airline'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'edkolev/tmuxline.vim'
 Plug 'freeo/vim-kalisi'
-Plug 'godlygeek/tabular'
+Plug 'godlygeek/tabular' , { 'on' : 'Tab' }
 Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
 Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
+Plug 'junegunn/fzf', { 'on' : 'FZF' }
 Plug 'junegunn/seoul256.vim'
-Plug 'junegunn/fzf' , { 'on' : 'FZF' }
-Plug 'kien/ctrlp.vim'
+Plug 'junegunn/vim-pseudocl'
+Plug 'junegunn/vim-oblique'
+Plug 'junegunn/vim-peekaboo'
+Plug 'junegunn/rainbow_parentheses.vim'
+Plug 'kassio/neoterm', { 'on' : 'T' }
+Plug 'kien/ctrlp.vim', { 'on' : 'CtrlP' }
 Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' }
 Plug 'majutsushi/tagbar'
-Plug 'mileszs/ack.vim'
-Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' }
-Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+Plug 'mileszs/ack.vim', { 'on' : 'Ack' }
+Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' }
+Plug 'ryanss/vim-hackernews', { 'on' : 'HackerNews' }
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 Plug 'scrooloose/syntastic'
 Plug 'SirVer/ultisnips'
 Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
@@ -33,16 +39,17 @@ Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-obsession'
 Plug 'tpope/vim-repeat'
-Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
 Plug 'troydm/zoomwintab.vim'
 Plug 'Valloric/YouCompleteMe', { 'do' : './install.sh --clang-completer' }
+Plug 'xolox/vim-misc', { 'on' : 'Note' }
+Plug 'xolox/vim-notes', { 'on' : 'Note' }
 call plug#end()
 
 "" Plugins options
-let g:LatexBox_Folding=0
+let g:LatexBox_fold_automatic=0
 let g:LatexBox_latexmk_preview_continuously=1
 let g:LatexBox_quickfix=2
 let g:LatexBox_viewer='zathura'
@@ -84,6 +91,9 @@ let g:ctrlp_prompt_mappings = {
     \ 'PrtHistory(-1)':       ['<c-j>'],
     \ 'PrtHistory(1)':        ['<c-k>'],}
 
+let g:limelight_conceal_ctermfg = 'gray'
+let g:limelight_conceal_ctermfg = 240
+
 let g:syntastic_cpp_compiler = "g++"
 let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
 
@@ -105,8 +115,9 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
 
 let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
-let g:ycm_auto_trigger = 1
+let g:ycm_add_preview_to_completeopt = 0
 let g:ycm_confirm_extra_conf = 1
+let g:ycm_auto_trigger = 1
 
 "" Vim options
 
@@ -131,10 +142,11 @@ set undodir=/home/urbain/.nvim/vimundo/
 
 " Layout window
 set nonumber
+set diffopt=filler,vertical
 set listchars=tab:▸\ ,eol:¬,trail:-
 set fillchars=fold:\ ,vert:\ ,
-set showbreak=--▸\ ,
 set breakindent
+let &showbreak='--▸ '
 set colorcolumn=0
 set scrolloff=0
 set t_Co=256
@@ -142,7 +154,7 @@ set guitablabel=%N\ %t\ %M
 set showcmd
 
 " Layout text
-set nowrap
+set wrap
 set linebreak
 set textwidth=0
 set conceallevel=2
@@ -165,10 +177,10 @@ set lazyredraw
 set hidden
 
 " Colorscheme
-try | colorscheme solarized | catch | endtry
+silent! colo solarized
 highlight Comment cterm=italic
 set t_ZH=
-set t_ZR=
+set t_ZR=[23m
 
 "" Maps
 
@@ -192,6 +204,7 @@ nnoremap <Leader>ps :PlugStatus<cr>
 " Toggles
 nnoremap cop :set paste!<cr>
 nnoremap <Leader>tg :GitGutterToggle<cr>
+nnoremap <Leader>tl :Limelight!!<cr>
 nnoremap <Leader>tn :NERDTreeToggle<cr>
 nnoremap <Leader>tt :TagbarToggle<cr>
 nnoremap <Leader>tu :GundoToggle<cr>
@@ -219,6 +232,7 @@ nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>
 nnoremap <Return> o<Esc>
 nnoremap <s-Return> O<Esc>
+nnoremap >f :FZF ~ <cr>
 
 " Git
 nnoremap <Leader>gs :Gstatus<cr>
@@ -246,15 +260,21 @@ vnoremap , :
 
 " Neovim specific
 tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
+tnoremap <C-p> <C-\><C-n>:CtrlPMRUFiles<cr>
 nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
 inoremap <C-_> <Esc>:b term<cr>i
 
 "" Restore cursor position
-augroup autocommands
+augroup nvimrc
     au!
+    autocmd BufWritePost *vimrc source %
     autocmd BufWritePost *.cpp Neomake!
     autocmd BufReadPost *
                 \ if line("'\"") > 1 && line("'\"") <= line("$") |
                 \   exe "normal! g`\"" |
                 \ endif
 augroup END
+
+"" Experimental
+let g:notes_directories = ['~/dotfiles/notes']
+" Idea: instant download colorscheme
diff --git a/tex/header.sty b/tex/header.sty
new file mode 100644
index 0000000..0d436a3
--- /dev/null
+++ b/tex/header.sty
@@ -0,0 +1,90 @@
+% Compilation options
+\synctex=1
+
+% Packages
+\usepackage[T1]{fontenc}
+\usepackage[utf8]{inputenx}
+\usepackage[english]{babel}
+\usepackage{microtype}
+\usepackage{fancyhdr}
+\usepackage{listings}
+\usepackage{appendix}
+\usepackage{vmargin}
+\usepackage{setspace}
+\usepackage{mathrsfs}
+\usepackage{mathenv}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+\usepackage{amssymb}
+\usepackage{amscd}
+\usepackage{amsthm}
+\usepackage{mathrsfs}
+\usepackage{graphicx}
+\usepackage{epstopdf}
+\usepackage{subfigure}
+\usepackage{color}
+\usepackage{todonotes}
+\usepackage{caption}
+\usepackage[numbers]{natbib}
+\usepackage{hyperref}
+\usepackage{cleveref}
+
+% Packages options
+\hypersetup{citecolor=blue, colorlinks=true, linkcolor=[rgb]{0.,0.,0.7}}
+\graphicspath{{figures/}}
+
+% 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{\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{\contb}[2]{C_b^{#1} (#2)}
+\newcommand{\Space}[0]{\mathscr}
+\newcommand{\expect}[0]{\mathbb{E}}
+\newcommand{\dotx}[0]{\,\cdot\,}
+\newcommand{\abs}[1]{\left| #1 \right|}
+
+% Redefinitions
+\renewcommand{\d}[0]{\,\mathrm{d}}
+
+% Layout options
+\setlength{\parskip}{6pt}
+\setstretch{1.2}
+
+% Setting for the table of contents
+\setcounter{secnumdepth}{1}
+\setcounter{tocdepth}{1}
+
+% Theorems
+\theoremstyle{plain}
+\newtheorem{assumption}{Assumption}[section]
+\newtheorem{example}{Example}[section]
+\newtheorem{theorem}{Theorem}[section]
+\newtheorem{corollary}[theorem]{Corollary}
+\newtheorem{lemma}[theorem]{Lemma}
+\newtheorem{proposition}[theorem]{Proposition}
+\newtheorem{axiom}[theorem]{Axiom}
+\theoremstyle{definition}
+\newtheorem{definition}[theorem]{Definition}
+\theoremstyle{remark}
+\newtheorem{remark}[theorem]{Remark}
diff --git a/tex/report_default.tex b/tex/report_default.tex
deleted file mode 100644
index e9eb94f..0000000
--- a/tex/report_default.tex
+++ /dev/null
@@ -1,121 +0,0 @@
-\documentclass[10pt,twoside]{report} 
-
-% Files to include
-\includeonly{
-    preamble/title,
-    preamble/authorship,
-    preamble/abstract,
-    preamble/acknowledgements,
-    chapters/introduction,
-    chapters/chap1,
-    chapters/chap2,
-    chapters/chap3,
-    chapters/conclusion,
-}
-
-% Boolean variables
-\newif \ifcontents \contentsfalse
-\newif \ifbib \bibtrue
-\newif \iflong \longtrue
-
-% Packages
-\usepackage[utf8]{inputenx} 
-\usepackage[english]{babel}
-\usepackage{microtype}
-\usepackage{fancyhdr}
-\usepackage{listings}
-\usepackage{appendix}
-\usepackage{vmargin}
-\usepackage{setspace}
-\usepackage{mathenv}
-\usepackage{amsmath}
-\usepackage{amsfonts}
-\usepackage{amssymb}
-\usepackage{amscd}
-\usepackage{amsthm}
-\usepackage{hyperref}
-\usepackage{cleveref}
-\usepackage{graphicx}
-\usepackage{epstopdf}
-\usepackage{subfigure}
-\usepackage{color}
-
-% Packages with options
-\usepackage[labelfont=sc]{caption}
-\usepackage[square, numbers, comma, sort&compress]{natbib}
-
-% Layout options
-\setlength{\parskip}{6pt}
-
-% Compilation options
-\synctex=1
-
-% Setting for the table of contents
-\setcounter{secnumdepth}{3}
-\setcounter{tocdepth}{3}
-
-% 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]{\,\| #1 \|\,} 
-\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{\dx}[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}}
-
-% Theorems
-\theoremstyle{plain}
-\newtheorem{assumption}{Assumption}[section]
-\newtheorem{example}{Example}[section]
-\newtheorem{theorem}{Theorem}[section]
-\newtheorem{corollary}[theorem]{Corollary}
-\newtheorem{lemma}[theorem]{Lemma}
-\newtheorem{proposition}[theorem]{Proposition}
-\newtheorem{axiom}[theorem]{Axiom}
-\theoremstyle{definition}
-\newtheorem{definition}[theorem]{Definition}
-\theoremstyle{remark}
-\newtheorem{remark}[theorem]{Remark}
-
-\begin{document}
-
-\pagestyle{empty}
-
-\setstretch{1.3} 
-\include{preamble/title} \cleardoublepage
-\include{preamble/authorship} \cleardoublepage
-\include{preamble/abstract} \cleardoublepage
-\include{preamble/acknowledgements} \cleardoublepage
-\ifcontents \tableofcontents \fi
-
-\pagestyle{plain}
-
-
-\include{chapters/introduction} \cleardoublepage
-\include{chapters/chap1} \cleardoublepage
-\include{chapters/chap2} \cleardoublepage
-\include{chapters/chap3} \cleardoublepage
-\include{chapters/conclusion} \cleardoublepage
-
-\nocite*
-\bibliographystyle{unsrtnat} 
-\bibliography{Bibliography} 
-
-\end{document}
-
diff --git a/tpm b/tpm
new file mode 160000
+Subproject 925145155451596934641021a2595fde18c190f
diff --git a/vim-plug b/vim-plug
new file mode 160000
+Subproject 7760f1c22b1d8db3310217b3774c361659daca1
diff --git a/vimrc b/vimrc
index 0e03d88..615cab0 100644
--- a/vimrc
+++ b/vimrc
@@ -19,6 +19,7 @@ Plugin 'honza/vim-snippets'
 Plugin 'jamessan/vim-gnupg'
 Plugin 'junegunn/seoul256.vim'
 Plugin 'junegunn/fzf' 
+Plugin 'AndrewRadev/splitjoin.vim'
 Plugin 'kien/ctrlp.vim'
 Plugin 'LaTeX-Box-Team/latex-box'
 Plugin 'majutsushi/tagbar'
diff --git a/vundle b/vundle
new file mode 160000
+Subproject cfd3b2d388a8c2e9903d7a9d80a65539aabfe93
diff --git a/zshrc b/zshrc
index 436e036..d3a7b59 100644
--- a/zshrc
+++ b/zshrc
@@ -33,56 +33,57 @@ alias -s tex=$EDITOR
 alias -s pdf=zathura
 
 # Directories
-alias u='cd ~/Dropbox/phd/papers/spectral/code/finite'
+alias books='cd ~/Dropbox/phd/books'
+alias cdd='cd ~/dotfiles'
+alias papers='cd ~/Dropbox/phd/papers'
+alias report='cd ~/Dropbox/phd/reports/9\ months'
+alias u='cd ~/Dropbox/phd'
 alias uc='cd ~/Dropbox/phd/programs'
 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'
+alias ur='cd ~/Dropbox/phd/reports'
 
 # Commands
-alias tmux="TERM=screen-256color-bce tmux"
-alias g='git'
-alias v='vim'
-alias n='nvim'
-alias e=$EDITOR
-alias vs="$EDITOR --servername SYNC"
-alias vsess="$EDITOR -S Session.vim"
-alias va="$EDITOR --servername SYNC main.tex \
-                                sections/introduction.tex \
-                                sections/sec1.tex \
-                                sections/sec2.tex \
-                                sections/sec3.tex \
-                                sections/conclusion.tex"
-alias c='clear'
-alias mc='make clean'
-alias m='mutt'
 alias a='vifm'
-alias mn="$EDITOR ~/.mynotes"
-alias x='sh ~/.xmodmap'
-alias mail='offlineimap -u quiet &'
+alias c='clear'
 alias ca='printf "\ec"'
-alias update='sudo apt-get update'
-alias upgrade='sudo apt-get upgrade'
+alias commit='git commit -a -m'
+alias e=$EDITOR
+alias g='git'
+alias gco='git checkout'
 alias install='sudo apt-get install'
-alias remove='sudo apt-get autoremove'
+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 pull='git pull origin master'
 alias purge='sudo apt-get purge'
 alias push='git push origin master'
-alias pull='git pull origin master'
-alias commit='git commit -a -m'
-alias gco='git checkout'
+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'
 
 # Configuration
-alias ez="$EDITOR ~/.zshrc"
 alias em="$EDITOR ~/.mutt/muttrc"
-alias ev="$EDITOR ~/.vimrc"
-alias eza="$EDITOR ~/.zathurarc"
+alias en="$EDITOR ~/.nvimrc"
+alias eo="$EDITOR ~/.offlineimaprc"
 alias et="$EDITOR ~/.tmux.conf"
+alias ev="$EDITOR ~/.vimrc"
 alias evi="$EDITOR ~/.vifm/vifmrc"
-alias eo="$EDITOR ~/.offlineimaprc"
 alias ex="$EDITOR ~/.xmodmap"
+alias ez="$EDITOR ~/.zshrc"
+alias eza="$EDITOR ~/.zathurarc"
+
+# Tmux
+alias son="tmux set -g status on"
+alias soff="tmux set -g status off"
 
 # Fix smart search history
 bindkey -a 'k' history-beginning-search-backward
@@ -93,3 +94,16 @@ crontab ~/.crontab
 
 TERM=xterm-256color
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+
+fancy-ctrl-z () {
+    if [[ $#BUFFER -eq 0 ]]; then
+        BUFFER="fg"
+        zle accept-line
+    else
+        zle push-input
+        zle clear-screen
+    fi
+}
+zle -N fancy-ctrl-z
+bindkey '^Z' fancy-ctrl-z