83 files changed, 155 insertions, 85 deletions

diff --git a/Xresources/Xresources b/.Xresources/base
index 96582a7..96582a7 100644
--- a/Xresources/Xresources
+++ b/.Xresources/base
diff --git a/Xresources/Xresources.dark b/.Xresources/dark
index 05660f5..5f28203 100644
--- a/Xresources/Xresources.dark
+++ b/.Xresources/dark
@@ -1,4 +1,4 @@
-# include "/home/urbain/.Xresources/Xresources"
+# include "/home/urbain/.Xresources/base"
 
 URxvt.borderColor: #002b36
 
diff --git a/Xresources/Xresources.light b/.Xresources/light
index 993b040..f1e1342 100644
--- a/Xresources/Xresources.light
+++ b/.Xresources/light
@@ -1,4 +1,4 @@
-# include "/home/urbain/.Xresources/Xresources"
+# include "/home/urbain/.Xresources/base"
 
 URxvt.borderColor: #fdf6e3
 
diff --git a/Xresources/Xresources.default b/.Xresources/seoul
index f9f6b1b..52e17e9 100644
--- a/Xresources/Xresources.default
+++ b/.Xresources/seoul
@@ -1,4 +1,4 @@
-# include "/home/urbain/.Xresources/Xresources"
+# include "/home/urbain/.Xresources/base"
 
 ! Border color
 URxvt.borderColor: #3a3a3a
diff --git a/bashrc b/.bashrc
index 0519eef..0519eef 100644
--- a/bashrc
+++ b/.bashrc
diff --git a/ctags b/.ctags
index 0c334fb..0c334fb 100644
--- a/ctags
+++ b/.ctags
diff --git a/git_template/hooks/ctags b/.git_template/hooks/ctags
index a9a2150..a9a2150 100755
--- a/git_template/hooks/ctags
+++ b/.git_template/hooks/ctags
diff --git a/git_template/hooks/post-checkout b/.git_template/hooks/post-checkout
index 84f17ed..84f17ed 100755
--- a/git_template/hooks/post-checkout
+++ b/.git_template/hooks/post-checkout
diff --git a/git_template/hooks/post-commit b/.git_template/hooks/post-commit
index 84f17ed..84f17ed 100755
--- a/git_template/hooks/post-commit
+++ b/.git_template/hooks/post-commit
diff --git a/git_template/hooks/post-merge b/.git_template/hooks/post-merge
index 84f17ed..84f17ed 100755
--- a/git_template/hooks/post-merge
+++ b/.git_template/hooks/post-merge
diff --git a/git_template/hooks/post-rewrite b/.git_template/hooks/post-rewrite
index fe8972d..fe8972d 100755
--- a/git_template/hooks/post-rewrite
+++ b/.git_template/hooks/post-rewrite
diff --git a/gitconfig b/.gitconfig
index 5afe4c8..5afe4c8 100644
--- a/gitconfig
+++ b/.gitconfig
diff --git a/.gitignore b/.gitignore
index 111c00b..5606b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,17 @@
-mutt/cache/
-mutt/cache/
-mutt/cache/headers
-mutt/mailboxes/
-mutt/mutt-colors-solarized/
-mutt/temp/
-newsbeuter
-vim/netrwhist
-vim/autoload/
-vim/plugged/
-vim/vim-plug/
-vim/vimundo/
-vifm/Trash
-vifm/vifminfo
-vifm/vimfiles
-nvim/.netrwhist
-vim/.netrwhist
+.mutt/cache/
+.mutt/cache/
+.mutt/cache/headers
+.mutt/mailboxes/
+.mutt/mutt-colors-solarized/
+.mutt/temp/
+.newsbeuter
+.vim/netrwhist
+.vim/autoload/
+.vim/plugged/
+.vim/vim-plug/
+.vim/vimundo/
+.vifm/Trash
+.vifm/vifminfo
+.vifm/vimfiles
+.nvim/.netrwhist
+.vim/.netrwhist
diff --git a/repos.zsh b/.grmrc
index 95b0fa2..95b0fa2 100644
--- a/repos.zsh
+++ b/.grmrc
diff --git a/i3/config b/.i3/config
index e8b0ff0..e8b0ff0 100644
--- a/i3/config
+++ b/.i3/config
diff --git a/i3/config.bak b/.i3/config.bak
index 0d02a52..0d02a52 100644
--- a/i3/config.bak
+++ b/.i3/config.bak
diff --git a/i3/config.working b/.i3/config.working
index 5f657a6..5f657a6 100644
--- a/i3/config.working
+++ b/.i3/config.working
diff --git a/i3/i3-init b/.i3/i3-init
index 32193b1..32193b1 100755
--- a/i3/i3-init
+++ b/.i3/i3-init
diff --git a/inputrc b/.inputrc
index 1221bb9..1221bb9 100644
--- a/inputrc
+++ b/.inputrc
diff --git a/latexmkrc b/.latexmkrc
index 03c512c..03c512c 100644
--- a/latexmkrc
+++ b/.latexmkrc
diff --git a/msmtprc b/.msmtprc
index 99e0e3e..99e0e3e 100644
--- a/msmtprc
+++ b/.msmtprc
diff --git a/mutt/.maillog b/.mutt/.maillog
index 07b9c59..07b9c59 100644
--- a/mutt/.maillog
+++ b/.mutt/.maillog
diff --git a/.mutt/alias b/.mutt/alias
new file mode 100644
index 0000000..295eda9
--- /dev/null
+++ b/.mutt/alias
@@ -0,0 +1,21 @@
+alias krystle \"Krystle Acquah\" <krystle.acquah-arhin13@imperial.ac.uk>
+alias khoi \"Khoi Nguyen\" <khoi@member.fsf.org>
+alias me \"Urbain Vaes\" <urbainvaes90@gmail.com>
+alias amanda \"Amanda Diez\" <amanda.diez10@imperial.ac.uk>
+alias vaes \"Christophe & Nathalies Vaes\" <vaesvdb@gmail.com>
+alias greg \"Greg Pavliotis\" <g.pavliotis@imperial.ac.uk>
+alias tina \"Tina\" <tina@astberrys.co.uk>
+alias rusudan \"Svanidze, Rusudan\" <r.svanidze@imperial.ac.uk>
+alias mathieu \"Majorel, Mathieu R\" <mathieu.majorel13@imperial.ac.uk>
+alias jul Julien Vaes <vaesjulien1993@gmail.com>
+alias assyr Assyr Abdulle <assyr.abdulle@epfl.ch>
+alias gradschool Graduate school <graduate.school@imperial.ac.uk>
+alias virginie.ledouble Virginie Ledouble <virginie.ledouble@epfl.ch>
+alias anderson.santos \"Santos, Anderson D S\" <a.santos@imperial.ac.uk>
+alias nick.jones \"Jones, Nick\" <nick.jones@imperial.ac.uk>
+alias pierre.blacque \"Blacque, Pierre\" <pierremathieu.blacque10@imperial.ac.uk>
+alias amanda.diez \"Diez Fernandez, Amanda\" <amanda.diez10@imperial.ac.uk>
+alias colin.cotter Colin Cotter <colin.cotter@imperial.ac.uk>
+alias eric.keaveny \"Keaveny, Eric E\" <e.keaveny@imperial.ac.uk>
+alias giuseppe.mallia Giuseppe Mallia <malliagiuseppe@googlemail.com>
+alias luca.mingarelli \"Mingarelli, Luca\" <l.mingarelli13@imperial.ac.uk>
diff --git a/mutt/mailboxes b/.mutt/mailboxes
index 6161f0e..6161f0e 100644
--- a/mutt/mailboxes
+++ b/.mutt/mailboxes
diff --git a/mutt/mailcap b/.mutt/mailcap
index 59df58e..59df58e 100644
--- a/mutt/mailcap
+++ b/.mutt/mailcap
diff --git a/mutt/muttrc b/.mutt/muttrc
index fb57f0a..fb57f0a 100644
--- a/mutt/muttrc
+++ b/.mutt/muttrc
diff --git a/ncmpcpp/config b/.ncmpcpp/config
index 127a875..127a875 100644
--- a/ncmpcpp/config
+++ b/.ncmpcpp/config
diff --git a/ncmpcpp/error.log b/.ncmpcpp/error.log
index e69de29..e69de29 100644
--- a/ncmpcpp/error.log
+++ b/.ncmpcpp/error.log
diff --git a/notes/Notes b/.notes/Notes
index 5c69bb3..6976cf5 100644
--- a/notes/Notes
+++ b/.notes/Notes
@@ -1,8 +1,8 @@
 Notes
 
 # Phd Todos
-
    • High priority
+      ◦ Establish structure of draft paper
       ◦ Investigate proof of spectral convergence
    • Medium priority
       ◦ Implement Smolyak algorithm
diff --git a/offlineimap.py b/.offlineimap/offlineimap.py
index c63b82d..c63b82d 100644
--- a/offlineimap.py
+++ b/.offlineimap/offlineimap.py
diff --git a/offlineimaprc b/.offlineimap/offlineimaprc
index 4dc46f1..4dc46f1 100644
--- a/offlineimaprc
+++ b/.offlineimap/offlineimaprc
diff --git a/passwords/gmail.asc b/.passwords/gmail.asc
index 08de50b..08de50b 100644
--- a/passwords/gmail.asc
+++ b/.passwords/gmail.asc
diff --git a/passwords/hotmail.asc b/.passwords/hotmail.asc
index dd7f078..dd7f078 100644
--- a/passwords/hotmail.asc
+++ b/.passwords/hotmail.asc
diff --git a/passwords/imperial.asc b/.passwords/imperial.asc
index 69c898a..69c898a 100644
--- a/passwords/imperial.asc
+++ b/.passwords/imperial.asc
diff --git a/passwords/main.asc b/.passwords/main.asc
index e284c92..e284c92 100644
--- a/passwords/main.asc
+++ b/.passwords/main.asc
diff --git a/tmux.conf b/.tmux.conf
index 989a487..989a487 100644
--- a/tmux.conf
+++ b/.tmux.conf
diff --git a/urxvt/ext/clipboard b/.urxvt/ext/clipboard
index 05e1601..05e1601 100644
--- a/urxvt/ext/clipboard
+++ b/.urxvt/ext/clipboard
diff --git a/urxvt/ext/fullscreen b/.urxvt/ext/fullscreen
index ebed22f..ebed22f 100644
--- a/urxvt/ext/fullscreen
+++ b/.urxvt/ext/fullscreen
diff --git a/urxvt/ext/keyboard-select b/.urxvt/ext/keyboard-select
index 3627360..3627360 100644
--- a/urxvt/ext/keyboard-select
+++ b/.urxvt/ext/keyboard-select
diff --git a/urxvt/ext/rotate-colors b/.urxvt/ext/rotate-colors
index 0016d6a..0016d6a 100644
--- a/urxvt/ext/rotate-colors
+++ b/.urxvt/ext/rotate-colors
diff --git a/urxvt/ext/url-select b/.urxvt/ext/url-select
index dc80496..dc80496 100644
--- a/urxvt/ext/url-select
+++ b/.urxvt/ext/url-select
diff --git a/config/uzbl/config b/.uzbl/config
index 7c3614a..5539181 100644
--- a/config/uzbl/config
+++ b/.uzbl/config
@@ -39,7 +39,7 @@ set set_mode        = set mode =
 set set_status      = set status_message =
 
 # Spawn path shortcuts. In spawn the first dir+path match is used in "dir1:dir2:dir3:executable"
-set scripts_dir      = @data_home/uzbl:@prefix/share/uzbl/examples/data:scripts
+set scripts_dir      = /home/urbain/dotfiles/config/uzbl/scripts:@data_home/uzbl:@prefix/share/uzbl/examples/data:scripts
 
 ## Hardcoded handlers
 
@@ -422,7 +422,10 @@ menu_add Quit uzbl = exit
 # Link context menu
 menu_link_add Print Link = print \@SELECTED_URI
 
-# === Mode configuration =====================================================
+# Go up one dir
+@cbind gu = spawn @scripts_dir/goup.pl
+
+# Mode configuration
 
 # Define some mode specific uzbl configurations.
 set command  = @mode_config command
diff --git a/.uzbl/scripts/goup.pl b/.uzbl/scripts/goup.pl
new file mode 100755
index 0000000..f7ae275
--- /dev/null
+++ b/.uzbl/scripts/goup.pl
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+my ($config,$pid,$xid,$fifo,$socket,$url,$title,$cmd) = @ARGV;
+if($fifo eq "") { die "No fifo"; };
+
+# Delete last slash
+chop($url);
+
+my $index = index(reverse($url), '/');
+
+# if youre already on top of the directory structure
+if ($index == -1)
+{
+	print $url;	
+	exit;
+}
+
+# Workaround for missing reverse index
+$url = (substr(reverse($url), $index, length($url) ));
+$url = reverse($url);
+print $url."\n";
+
+# This could look prettier with native fifo access
+qx(echo "act uri $url" >> $fifo);
diff --git a/config/uzbl/style.css b/.uzbl/style.css
index a5fe457..a5fe457 100644
--- a/config/uzbl/style.css
+++ b/.uzbl/style.css
diff --git a/vifm/colors/default b/.vifm/colors/default
index c3c72dd..c3c72dd 100644
--- a/vifm/colors/default
+++ b/.vifm/colors/default
diff --git a/vifm/colors/matrix b/.vifm/colors/matrix
index 70a9f76..70a9f76 100644
--- a/vifm/colors/matrix
+++ b/.vifm/colors/matrix
diff --git a/vifm/colorschemes b/.vifm/colorschemes
index 006bb44..006bb44 100644
--- a/vifm/colorschemes
+++ b/.vifm/colorschemes
diff --git a/vifm/vifm-help.txt b/.vifm/vifm-help.txt
index 2b6bbba..2b6bbba 100644
--- a/vifm/vifm-help.txt
+++ b/.vifm/vifm-help.txt
diff --git a/vifm/vifmrc b/.vifm/vifmrc
index b6efb37..b6efb37 100644
--- a/vifm/vifmrc
+++ b/.vifm/vifmrc
diff --git a/vifm/vifmrc.bak b/.vifm/vifmrc.bak
index 81f84fa..81f84fa 100644
--- a/vifm/vifmrc.bak
+++ b/.vifm/vifmrc.bak
diff --git a/vim/after/ftplugin/tex/folding.vim b/.vim/after/ftplugin/tex/folding.vim
index e69de29..e69de29 100644
--- a/vim/after/ftplugin/tex/folding.vim
+++ b/.vim/after/ftplugin/tex/folding.vim
diff --git a/vim/after/ftplugin/tex/mappings.vim b/.vim/after/ftplugin/tex/mappings.vim
index e7dd610..e7dd610 100644
--- a/vim/after/ftplugin/tex/mappings.vim
+++ b/.vim/after/ftplugin/tex/mappings.vim
diff --git a/vim/after/ftplugin/tex/unilatex.vim b/.vim/after/ftplugin/tex/unilatex.vim
index 69358fc..69358fc 100644
--- a/vim/after/ftplugin/tex/unilatex.vim
+++ b/.vim/after/ftplugin/tex/unilatex.vim
diff --git a/vim/after/ftplugin/vim/folding.vim b/.vim/after/ftplugin/vim/folding.vim
index 1454cbe..1454cbe 100644
--- a/vim/after/ftplugin/vim/folding.vim
+++ b/.vim/after/ftplugin/vim/folding.vim
diff --git a/vim/after/syntax/cpp.vim b/.vim/after/syntax/cpp.vim
index 4da741d..4da741d 100644
--- a/vim/after/syntax/cpp.vim
+++ b/.vim/after/syntax/cpp.vim
diff --git a/vim/after/syntax/cpp.vim~ b/.vim/after/syntax/cpp.vim~
index e69de29..e69de29 100644
--- a/vim/after/syntax/cpp.vim~
+++ b/.vim/after/syntax/cpp.vim~
diff --git a/vim/after/syntax/tex.vim b/.vim/after/syntax/tex.vim
index a40cc30..a40cc30 100644
--- a/vim/after/syntax/tex.vim
+++ b/.vim/after/syntax/tex.vim
diff --git a/vim/after/syntax/tex.vim~ b/.vim/after/syntax/tex.vim~
index 4e1d112..4e1d112 100644
--- a/vim/after/syntax/tex.vim~
+++ b/.vim/after/syntax/tex.vim~
diff --git a/vim/colors/mine.vim b/.vim/colors/mine.vim
index 653682e..653682e 100644
--- a/vim/colors/mine.vim
+++ b/.vim/colors/mine.vim
diff --git a/vim/colors/mine.vim~ b/.vim/colors/mine.vim~
index 653682e..653682e 100644
--- a/vim/colors/mine.vim~
+++ b/.vim/colors/mine.vim~
diff --git a/vim/mySnippets/all.snippets b/.vim/mySnippets/all.snippets
index 8094025..8094025 100644
--- a/vim/mySnippets/all.snippets
+++ b/.vim/mySnippets/all.snippets
diff --git a/vim/mySnippets/cpp.snippets b/.vim/mySnippets/cpp.snippets
index d314641..d314641 100644
--- a/vim/mySnippets/cpp.snippets
+++ b/.vim/mySnippets/cpp.snippets
diff --git a/vim/mySnippets/mail.snippets b/.vim/mySnippets/mail.snippets
index 9839916..9839916 100644
--- a/vim/mySnippets/mail.snippets
+++ b/.vim/mySnippets/mail.snippets
diff --git a/vim/mySnippets/python.snippets b/.vim/mySnippets/python.snippets
index 6dbc272..6dbc272 100644
--- a/vim/mySnippets/python.snippets
+++ b/.vim/mySnippets/python.snippets
diff --git a/vim/mySnippets/tex.snippets b/.vim/mySnippets/tex.snippets
index 9c74845..9c74845 100644
--- a/vim/mySnippets/tex.snippets
+++ b/.vim/mySnippets/tex.snippets
diff --git a/vim/mySnippets/vim.snippets b/.vim/mySnippets/vim.snippets
index e69de29..e69de29 100644
--- a/vim/mySnippets/vim.snippets
+++ b/.vim/mySnippets/vim.snippets
diff --git a/vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index 460c1ea..460c1ea 100644
--- a/vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
diff --git a/vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index a300e1e..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
index a41bf79..a41bf79 100644
--- a/vim/spell/en.utf-8.spl
+++ b/.vim/spell/en.utf-8.spl
diff --git a/vim/spell/en.utf-8.sug b/.vim/spell/en.utf-8.sug
index b82667d..b82667d 100644
--- a/vim/spell/en.utf-8.sug
+++ b/.vim/spell/en.utf-8.sug
diff --git a/vimrc b/.vim/vimrc
index 2558fe1..13b520a 100644
--- a/vimrc
+++ b/.vim/vimrc
@@ -23,7 +23,7 @@ Plug 'junegunn/rainbow_parentheses.vim'
 Plug 'justinmk/vim-sneak'
 Plug 'kassio/neoterm', { 'on' : 'T' }
 Plug 'kien/ctrlp.vim'
-Plug 'lervag/vimtex' ", { 'for' : 'tex' }
+Plug 'lervag/vimtex'
 Plug 'majutsushi/tagbar'
 Plug 'mileszs/ack.vim', { 'on' : 'Ack' }
 Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' }
@@ -48,8 +48,7 @@ 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'
 Plug 'xolox/vim-notes'
 call plug#end()
@@ -309,7 +308,7 @@ nnoremap <silent> <Leader>C :call fzf#run({
 \ })<CR>
 
 "" Experimental
-let g:notes_directories = ['~/dotfiles/notes']
+let g:notes_directories = ['~/.notes']
 let g:pymode=0
 
 " Idea: instant download colorscheme
diff --git a/xinitrc b/.xinitrc
index 211eb34..adc9614 100755
--- a/xinitrc
+++ b/.xinitrc
@@ -3,14 +3,15 @@
 # Key repeat rate
 xset r rate 400 50
 
-# Dvorak programer
-setxkbmap us -variant dvp
-
 # Load key bindings
-$HOME/.xmodmap
-
-# Set colorscheme to light
-export COLORSCHEME=dark
+$HOME/bin/keyboard.sh
 
 # Load Xresources to light colorscheme
 xrdb $HOME/.Xresources/Xresources.dark
+
+# Start gpg-agent
+killall -9 gpg-agent
+
+gpg-agent --daemon --enable-ssh-support \
+    --write-env-file "${HOME}/.gpg-agent-info"
+
diff --git a/zathurarc b/.zathurarc
index 543633d..543633d 100644
--- a/zathurarc
+++ b/.zathurarc
diff --git a/zsh/zsh-aliases b/.zsh/zsh-aliases
index 9d2dbe6..9d2dbe6 100644
--- a/zsh/zsh-aliases
+++ b/.zsh/zsh-aliases
diff --git a/zsh/zsh-functions b/.zsh/zsh-functions
index f9f387d..f9f387d 100644
--- a/zsh/zsh-functions
+++ b/.zsh/zsh-functions
diff --git a/zsh/zsh-plugins b/.zsh/zsh-plugins
index 23e94cc..26b5726 100644
--- a/zsh/zsh-plugins
+++ b/.zsh/zsh-plugins
@@ -55,5 +55,5 @@ fi
 
 # GRM
 {
-    REPOFILE=/home/urbain/dotfiles/repos.zsh
+    REPOFILE=/home/urbain/.grmrc
 }
diff --git a/zsh/zsh-tmp b/.zsh/zsh-tmp
index a5abbce..a5abbce 100644
--- a/zsh/zsh-tmp
+++ b/.zsh/zsh-tmp
diff --git a/zshrc b/.zsh/zshrc
index dae16bf..c891760 100644
--- a/zshrc
+++ b/.zsh/zshrc
@@ -14,9 +14,8 @@ bindkey '^P' history-beginning-search-backward
 bindkey '^N' history-beginning-search-forward
 
 # Paths of executables
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:\
-    /usr/bin:/sbin:/bin:/usr/games:/usr/local/games:\
-    /home/urbain/bin"
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+export PATH="$PATH:/home/urbain/.local/bin"
 
 # Editor
 export EDITOR=/usr/bin/nvim
diff --git a/crontab b/crontab
deleted file mode 100644
index 8e35777..0000000
--- a/crontab
+++ /dev/null
@@ -1 +0,0 @@
-*/5 * * * * sh ~/.xmodmap
diff --git a/install.sh b/install.sh
index 4417d91..1c358e5 100755
--- a/install.sh
+++ b/install.sh
@@ -1,42 +1,81 @@
-#!/bin/bash
+#!/bin/zsh
 
-home=/home/urbain
-dir=$home/dotfiles
-olddir=$home/dotfiles_old
+HOME=/home/urbain
+dotdir=$HOME/dotfiles
 
-function install_dotfiles {
-    echo -e "\n*** \e[1mInstalling dotfiles\e[0m ***"
+unset dotdirs install uninstall
+declare -A dotdirs install uninstall
 
-    rm -rf $olddir
-    mkdir -p $olddir
+for file in `ls -A --ignore="install.sh" --ignore="README.md" --ignore=".git"`; do
+    dotdirs[$file]="$HOME/$file"
+    install[$file]='ln -s $dotdir/$file $(basename $dotdirs[$file])'
+    uninstall[$file]='rm -rf $dotdirs[$file]'
+done
 
-    listFiles=`ls --ignore="make" --ignore="README.md"`
+install_offlineimap() {
+    ln -s $dotdir/.offlineimap/offlineimaprc .offlineimaprc
+    ln -s $dotdir/.offlineimap/offlineimap.py .offlineimap.py
+}
 
-    cd $dir
-    for file in $listFiles; do
-        if [ -e ~/.$file ]; then
-            mv ~/.$file $olddir
-            printf '~/.%-15s exists. ' $file
-            echo -n "Moving it to $olddir. "
-        fi
-        ln -s $dir/$file ~/.$file
-        echo "(Re)-creating symbolic link of $file."
-    done
+install_vim() {
+    ln -s $dotdir/.vim/vimrc .vimrc
+    ln -s $dotdir/.vim .vim
+    ln -s $dotdir/.vim/vimrc .nvimrc
+    ln -s $dotdir/.vim .nvim
+
+    mkdir -p .vim/vimundo
+}
+
+install_mutt() {
+    ln -s $dotdir/.mutt .mutt
+    mkdir -p .mutt/temp
+    mkdir -p .mutt/cache
+    mkdir -p .mutt/cache/bodies
+}
 
-    cd $dir
-    mkdir -p vim/vimundo
-    mkdir -p mutt/temp
-    mkdir -p mutt/cache
-    mkdir -p mutt/cache/bodies
+install_zsh() {
+    ln -s $dotdir/.zsh/zshrc .zshrc
+    ln -s $dotdir/.zsh .zsh
+}
 
-    cd ~/.config/zathura/
-    ln -s /home/urbain/dotfiles/zathurarc
+uninstall_offlineimap() {
+    rm -f .offlineimaprc
+    rm -f .offlineimap.py
 }
 
-function clean {
-    echo -e "\n*** \e[1mCleaning dotfiles\e[0m ***"
-    for file in `ls`; do
-        rm -rfv  ~/.$file
+uninstall_vim() {
+    rm -rf .vim .vimrc .nvim .nvimrc
+}
+
+uninstall_zsh() {
+    rm -rf .zsh .zshrc
+}
+
+dotdirs[.uzbl]="$HOME/.config/uzbl"
+dotdirs[.zathurarc]="$HOME/.config/zathura/zathurarc"
+
+install[.offlineimap]='install_offlineimap'
+install[.vim]='install_vim'
+install[.mutt]='install_mutt'
+install[.zsh]='install_zsh'
+
+uninstall[.offlineimap]='uninstall_offlineimap'
+uninstall[.vim]='uninstall_vim'
+uninstall[.zsh]='uninstall_zsh'
+
+clean_dotfiles() {
+    for file in ${(@k)dotdirs}; do
+	echo "Cleaning $file"
+        cd $(dirname $dotdirs[$file])
+        eval ${uninstall[$file]}
+    done
+}
+
+install_dotfiles() {
+    for file in ${(@k)dotdirs}; do
+	echo "Installing $file"
+        cd $(dirname $dotdirs[$file])
+        eval ${install[$file]}
     done
 }
 
@@ -45,18 +84,5 @@ function install_packages {
         tmux git gcc clang cmake make zathura feh chromium-browser zsh clang xcape
 }
 
-function update_dotfiles {
-    cd $dir
-    echo -e "\n*** \e[1m Updating dotfiles repository\e[0m ***"
-    git fetch -q origin master
-    cat <(git log --reverse --pretty=format:"-- %h %s (%cr)" -4); echo -e "\e[36m"
-    output=$(git log HEAD..origin)
-    if [[ ! -z $output ]]; then
-        cat <(git log --reverse --pretty=format:"-- %h %s (%cr)" HEAD..origin); echo -e "\e[0m"
-    else
-        echo -e "-- No updates since last pull\e[0m"
-    fi
-}
-
-update_dotfiles
+clean_dotfiles
 install_dotfiles
diff --git a/nvim b/nvim
deleted file mode 120000
index 7923f59..0000000
--- a/nvim
+++ /dev/null
@@ -1 +0,0 @@
-vim
\ No newline at end of file
diff --git a/nvimrc b/nvimrc
deleted file mode 120000
index c9a3c9c..0000000
--- a/nvimrc
+++ /dev/null
@@ -1 +0,0 @@
-vimrc
\ No newline at end of file
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
deleted file mode 160000
-Subproject cfd3b2d388a8c2e9903d7a9d80a65539aabfe93