Split install file

21 files changed, 110 insertions, 797 deletions

diff --git a/.gitignore b/.gitignore
index 5606b25..5ccb74a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 .vim/netrwhist
 .vim/autoload/
 .vim/plugged/
-.vim/vim-plug/
 .vim/vimundo/
 .vifm/Trash
 .vifm/vifminfo
diff --git a/.gitmodules b/.gitmodules
index e69de29..4025b5d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule ".vim/vim-plug"]
+	path = .vim/vim-plug
+	url = https://github.com/junegunn/vim-plug
diff --git a/.i3/config.bak b/.i3/config.bak
deleted file mode 100644
index 0d02a52..0000000
--- a/.i3/config.bak
+++ /dev/null
@@ -1,156 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod1
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango:DejaVu Sans Mono 8
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
-
-# kill focused window
-bindsym $mod+Shift+Q kill
-
-# start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-# change focus
-bindsym $mod+h focus left
-bindsym $mod+t focus down
-bindsym $mod+n focus up
-bindsym $mod+s focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+H move left
-bindsym $mod+Shift+T move down
-bindsym $mod+Shift+N move up
-bindsym $mod+Shift+S move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-# bindsym $mod+n split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+r layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+g layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# switch to workspace
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-bindsym $mod+6 workspace 6
-bindsym $mod+7 workspace 7
-bindsym $mod+8 workspace 8
-bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
-
-# move focused container to workspace
-bindsym $mod+Shift+exclam move container to workspace 1
-bindsym $mod+Shift+at move container to workspace 2
-bindsym $mod+Shift+numbersign move container to workspace 3
-bindsym $mod+Shift+dollar move container to workspace 4
-bindsym $mod+Shift+percent move container to workspace 5
-bindsym $mod+Shift+asciicircum move container to workspace 6
-bindsym $mod+Shift+ampersand move container to workspace 7
-bindsym $mod+Shift+asterisk move container to workspace 8
-bindsym $mod+Shift+parenleft move container to workspace 9
-bindsym $mod+Shift+parenright move container to workspace 10
-
-# reload the configuration file
-bindsym $mod+Shift+C reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+R restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+E exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym semicolon resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-# bindsym $mod+r mode "resize"
-bindsym $mod+m exec /home/urbain/.i3/winmenu.py
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-        status_command i3status
-}
-
-exec_always i3-init
diff --git a/.i3/config.working b/.i3/config.working
deleted file mode 100644
index 5f657a6..0000000
--- a/.i3/config.working
+++ /dev/null
@@ -1,176 +0,0 @@
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-#
-# This config file uses keycodes (bindsym) and was written for the QWERTY
-# layout.
-#
-# To get a config file with the same key positions, but for your current
-# layout, use the i3-config-wizard
-#
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango:DejaVu Sans Mono 8
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
-# use these keys for focus, movement, and resize directions when reaching for
-# the arrows is not convenient
-set $up l
-set $down k
-set $left j
-set $right semicolon
-
-# use Mouse+Mod1 to drag floating windows to their wanted position
-floating_modifier Mod1
-
-# start a terminal
-bindsym Mod1+Return exec i3-sensible-terminal
-
-# kill focused window
-bindsym Mod1+Shift+q kill
-
-# start dmenu (a program launcher)
-# bindsym Mod1+d exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-bindsym Mod1+d exec --no-startup-id i3-dmenu-desktop
-
-# change focus
-bindsym Mod1+$left focus left
-bindsym Mod1+$down focus down
-bindsym Mod1+$up focus up
-bindsym Mod1+$right focus right
-
-# alternatively, you can use the cursor keys:
-bindsym Mod1+Left focus left
-bindsym Mod1+Down focus down
-bindsym Mod1+Up focus up
-bindsym Mod1+Right focus right
-
-# move focused window
-bindsym Mod1+Shift+$left move left
-bindsym Mod1+Shift+$down move down
-bindsym Mod1+Shift+$up move up
-bindsym Mod1+Shift+$right move right
-
-# alternatively, you can use the cursor keys:
-bindsym Mod1+Shift+Left move left
-bindsym Mod1+Shift+Down move down
-bindsym Mod1+Shift+Up move up
-bindsym Mod1+Shift+Right move right
-
-# split in horizontal orientation
-bindsym Mod1+h split h
-
-# split in vertical orientation
-bindsym Mod1+v split v
-
-# enter fullscreen mode for the focused container
-bindsym Mod1+f fullscreen
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym Mod1+s layout stacking
-bindsym Mod1+w layout tabbed
-bindsym Mod1+e layout toggle split
-
-# toggle tiling / floating
-bindsym Mod1+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym Mod1+space focus mode_toggle
-
-# focus the parent container
-bindsym Mod1+a focus parent
-
-# focus the child container
-#bindsym Mod1+d focus child
-
-# move the currently focused window to the scratchpad
-bindsym Mod1+Shift+minus move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
-bindsym Mod1+minus scratchpad show
-
-# switch to workspace
-bindsym Mod1+1 workspace 1
-bindsym Mod1+2 workspace 2
-bindsym Mod1+3 workspace 3
-bindsym Mod1+4 workspace 4
-bindsym Mod1+5 workspace 5
-bindsym Mod1+6 workspace 6
-bindsym Mod1+7 workspace 7
-bindsym Mod1+8 workspace 8
-bindsym Mod1+9 workspace 9
-bindsym Mod1+0 workspace 10
-
-# move focused container to workspace
-bindsym Mod1+Shift+1 move container to workspace 1
-bindsym Mod1+Shift+2 move container to workspace 2
-bindsym Mod1+Shift+3 move container to workspace 3
-bindsym Mod1+Shift+4 move container to workspace 4
-bindsym Mod1+Shift+5 move container to workspace 5
-bindsym Mod1+Shift+6 move container to workspace 6
-bindsym Mod1+Shift+7 move container to workspace 7
-bindsym Mod1+Shift+8 move container to workspace 8
-bindsym Mod1+Shift+9 move container to workspace 9
-bindsym Mod1+Shift+0 move container to workspace 10
-
-# reload the configuration file
-bindsym Mod1+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym Mod1+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym Mod1+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym $left       resize shrink width 10 px or 10 ppt
-        bindsym $down       resize grow height 10 px or 10 ppt
-        bindsym $up         resize shrink height 10 px or 10 ppt
-        bindsym $right      resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left        resize shrink width 10 px or 10 ppt
-        bindsym Down        resize grow height 10 px or 10 ppt
-        bindsym Up          resize shrink height 10 px or 10 ppt
-        bindsym Right       resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym Mod1+r mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-        status_command i3status
-}
-
-#######################################################################
-# automatically start i3-config-wizard to offer the user to create a
-# keysym-based config which used his favorite modifier (alt or windows)
-#
-# i3-config-wizard will not launch if there already is a config file
-# in ~/.i3/config.
-#
-# Please remove the following exec line:
-#######################################################################
-exec $HOME/.xinitrc
diff --git a/.i3/i3-init b/.i3/i3-init
deleted file mode 100755
index 32193b1..0000000
--- a/.i3/i3-init
+++ /dev/null
@@ -1,3 +0,0 @@
-setxkbmap -layout us -variant dvp
-xrdb /home/urbain/.Xresources
-/home/urbain/.xmodmap
diff --git a/.mutt/.maillog b/.mutt/.maillog
deleted file mode 100644
index 07b9c59..0000000
--- a/.mutt/.maillog
+++ /dev/null
@@ -1,230 +0,0 @@
-Date: Wed Oct 29 13:00:08 2014
-From: Choices Discounts <cs@corporateperks.com>
-Subj: Cinema: Price Promotion
-File: /home/urbain/.mail                                               (17491)
-
-Date: Wed Oct 29 14:09:08 2014
-From: "Marshall, Richard L" <r.l.marshall@imperial.ac.uk>
-Subj: Daiwa Scholarships 2015: Language Learning, Homestay and Work
-File: /home/urbain/.mail                                                (7149)
-
-Date: Wed Oct 29 14:09:12 2014
-From: "Facebook" <notification+o_2_jc=y@facebookmail.com>
-Subj: Facebook login from "Chrome on Linux"
-File: /home/urbain/.mail                                               (11718)
-
-Date: Wed Oct 29 16:03:17 2014
-From: "Eggl, Maximilian" <maximilian.eggl11@imperial.ac.uk>
-Subj: Chess Club: Match Report
-File: /home/urbain/.mail                                               (23181)
-
-Date: Wed Oct 29 16:03:18 2014
-From: CAREERS <careers@imperial.ac.uk>
-Subj: CAREERS: WorldQuant Imperial College Information Session Monday 3rd
-File: /home/urbain/.mail                                               (19493)
-
-Date: Wed Oct 29 16:03:20 2014
-From: "Facebook" <notification+o_2_jc=y@facebookmail.com>
-Subj: Facebook login from "Chrome on Linux"
-File: /home/urbain/.mail                                               (11720)
-
-Date: Wed Oct 29 16:09:55 2014
-From: "Facebook" <notification+o_2_jc=y@facebookmail.com>
-Subj: Facebook login from "Chrome on Linux"
-File: /home/urbain/.mail                                               (11720)
-
-Date: Wed Oct 29 16:29:36 2014
-From: "Facebook" <notification+o_2_jc=y@facebookmail.com>
-Subj: Facebook login from "Chrome on Linux"
-File: /home/urbain/.mail                                               (11717)
-
-Date: Wed Oct 29 16:56:42 2014
-From: "Facebook" <notification+o_2_jc=y@facebookmail.com>
-Subj: Facebook login from "Chrome on Linux"
-File: /home/urbain/.mail                                               (11720)
-
-Date: Wed Oct 29 16:58:14 2014
-From: "Facebook" <notification+o_2_jc=y@facebookmail.com>
-Subj: Facebook login from "Chrome on Linux"
-File: /home/urbain/.mail                                               (11720)
-
-Date: Wed Oct 29 20:15:00 2014
-From: Salvador Rodriguez-Lopez <s.rodriguez-lopez@imperial.ac.uk>
-Subj: M2PM1-Tutorial 3
-File: /home/urbain/.mail                                                (6085)
-
-Date: Wed Oct 29 20:15:02 2014
-From: "Facebook" <notification+o_2_jc=y@facebookmail.com>
-Subj: Facebook login from "Chrome on Linux"
-File: /home/urbain/.mail                                               (11720)
-
-Date: Fri Oct 31 10:24:52 2014
-From: James Clear <james@jamesclear.com>
-Subj: Minimalism, Success, and the Curious Writing Habit of George R.R. Martin
-File: /home/urbain/.mail                                               (42928)
-
-Date: Fri Oct 31 10:24:53 2014
-From: An Introduction to Functional Analysis Course Team <noreply@coursera.org
-Subj: Week 8
-File: /home/urbain/.mail                                               (25361)
-
-Date: Fri Oct 31 10:24:53 2014
-From: An Introduction to Functional Analysis Course Team <noreply@coursera.org
-Subj: Correction of the problem 6
-File: /home/urbain/.mail                                               (25003)
-
-Date: Fri Oct 31 10:24:54 2014
-From: "Sisson, Chris D" <c.sisson@imperial.ac.uk>
-Subj: Marking Coursework
-File: /home/urbain/.mail                                                (3559)
-
-Date: Fri Oct 31 10:24:54 2014
-From: Christophe&Nathalie Vaes <vaesvdb@gmail.com>
-Subj: =?utf-8?Q?A_quelle_heure_fait-on_le_Skype,_Urb_ch=C3=A9ri_=3F=3F=3F=3F?=
-File: /home/urbain/.mail                                                (3154)
-
-Date: Fri Oct 31 10:24:55 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: 3 Months Report - Research Plan Confirmation
-File: /home/urbain/.mail                                              (471497)
-
-Date: Fri Oct 31 10:24:55 2014
-From: "Pryor, Gemma M" <g.pryor@imperial.ac.uk>
-Subj: Buying club membership
-File: /home/urbain/.mail                                               (44297)
-
-Date: Fri Oct 31 10:24:55 2014
-From: "Sisson, Chris D" <c.sisson@imperial.ac.uk>
-Subj: FW: Huxley Emergency toilet closures
-File: /home/urbain/.mail                                               (13394)
-
-Date: Fri Oct 31 10:24:55 2014
-From: Salvador Rodriguez-Lopez <s.rodriguez-lopez@imperial.ac.uk>
-Subj: Re: M2PM1-Tutorial 3
-File: /home/urbain/.mail                                              (141790)
-
-Date: Fri Oct 31 10:24:57 2014
-From: Grigoriy Volovskiy <grigoriy.volovskiy12@imperial.ac.uk>
-Subj: WG: Re: M2PM1-Tutorial 3
-File: /home/urbain/.mail                                               (12907)
-
-Date: Fri Oct 31 10:24:58 2014
-From: Grigoriy Volovskiy <grigoriy.volovskiy12@imperial.ac.uk>
-Subj: WG: Tutorial 3 M2PM1-Real Analysis
-File: /home/urbain/.mail                                                (5777)
-
-Date: Fri Oct 31 10:34:08 2014
-From: Grigoriy Volovskiy <grigorijvolovskij@gmail.com>
-Subj: 
-File: /home/urbain/.mail                                              (298990)
-
-Date: Fri Oct 31 12:11:54 2014
-From: Grigoriy Volovskiy <grigorijvolovskij@gmail.com>
-Subj: 
-File: /home/urbain/.mail                                              (298990)
-
-Date: Fri Oct 31 12:11:54 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Huxley Emergency toilet closures
-File: /home/urbain/.mail                                               (26349)
-
-Date: Fri Oct 31 12:11:54 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: 3 Months Report - Research Plan Confirmation
-File: /home/urbain/.mail                                              (473371)
-
-Date: Fri Oct 31 13:32:40 2014
-From: "Bright Network" <Bright.Network@dotmailer-email.com> 
-Subj: Get ahead in Entrepreneurship: Your weekly bulletin
-File: /home/urbain/.mail                                               (59613)
-
-Date: Fri Oct 31 13:32:41 2014
-From: Grigoriy Volovskiy <grigorijvolovskij@gmail.com>
-Subj: 
-File: /home/urbain/.mail                                              (298990)
-
-Date: Fri Oct 31 13:32:41 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Huxley Emergency toilet closures
-File: /home/urbain/.mail                                               (26349)
-
-Date: Fri Oct 31 13:32:41 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: 3 Months Report - Research Plan Confirmation
-File: /home/urbain/.mail                                              (473371)
-
-Date: Fri Oct 31 13:32:41 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Lost In Fathoms - General Public Seminar on Art & Science,
-File: /home/urbain/.mail                                               (23278)
-
-Date: Fri Oct 31 13:34:04 2014
-From: Grigoriy Volovskiy <grigorijvolovskij@gmail.com>
-Subj: 
-File: /home/urbain/.mail                                              (298990)
-
-Date: Fri Oct 31 13:34:04 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Huxley Emergency toilet closures
-File: /home/urbain/.mail                                               (26349)
-
-Date: Fri Oct 31 13:34:04 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: 3 Months Report - Research Plan Confirmation
-File: /home/urbain/.mail                                              (473371)
-
-Date: Fri Oct 31 13:34:04 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Lost In Fathoms - General Public Seminar on Art & Science,
-File: /home/urbain/.mail                                               (23278)
-
-Date: Fri Oct 31 14:26:23 2014
-From: "Ingram, Michael" <michael.ingram12@imperial.ac.uk>
-Subj: [Swim-List] Synchro event
-File: /home/urbain/.mail                                               (30387)
-
-Date: Fri Oct 31 14:26:23 2014
-From: Grigoriy Volovskiy <grigorijvolovskij@gmail.com>
-Subj: 
-File: /home/urbain/.mail                                              (298990)
-
-Date: Fri Oct 31 14:26:23 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Huxley Emergency toilet closures
-File: /home/urbain/.mail                                               (26349)
-
-Date: Fri Oct 31 14:26:24 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: 3 Months Report - Research Plan Confirmation
-File: /home/urbain/.mail                                              (473371)
-
-Date: Fri Oct 31 14:26:24 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Lost In Fathoms - General Public Seminar on Art & Science,
-File: /home/urbain/.mail                                               (23278)
-
-Date: Fri Oct 31 14:46:10 2014
-From: Grigoriy Volovskiy <grigorijvolovskij@gmail.com>
-Subj: 
-File: /home/urbain/.mail                                              (298990)
-
-Date: Fri Oct 31 14:46:10 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Huxley Emergency toilet closures
-File: /home/urbain/.mail                                               (26349)
-
-Date: Fri Oct 31 14:46:10 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: 3 Months Report - Research Plan Confirmation
-File: /home/urbain/.mail                                              (473371)
-
-Date: Fri Oct 31 14:46:10 2014
-From: "Svanidze, Rusudan" <r.svanidze@imperial.ac.uk>
-Subj: FW: Lost In Fathoms - General Public Seminar on Art & Science,
-File: /home/urbain/.mail                                               (23278)
-
-Date: Fri Oct 31 14:46:11 2014
-From: "Cannon, Claudia M" <c.cannon@imperial.ac.uk>
-Subj: Seminars and Events Week Commencing Monday 3rd November 2014
-File: /home/urbain/.mail                                              (144591)
-
diff --git a/.mutt/Makefile b/.mutt/Makefile
new file mode 100644
index 0000000..a4b94ce
--- /dev/null
+++ b/.mutt/Makefile
@@ -0,0 +1,19 @@
+HOME=/home/urbain
+TARGETS=$(addprefix $(HOME)/,.mutt .mutt/temp .mutt/cache .mutt/cache/bodies)
+
+all : $(TARGETS)
+
+$(HOME)/.mutt :
+	rm -f $@ && ln -s $(PWD) $@
+
+$(HOME)/.mutt/temp :
+	mkdir -p $@
+
+$(HOME)/.mutt/cache :
+	mkdir -p $@
+
+$(HOME)/.mutt/cache/bodies :
+	mkdir -p $@
+
+clean :
+	rm -f $(TARGETS)
diff --git a/.mutt/aliase b/.mutt/aliase
deleted file mode 100644
index dbc8113..0000000
--- a/.mutt/aliase
+++ /dev/null
@@ -1 +0,0 @@
-alias clement.vaes Clement Vaes <clement.vaes@student.uclouvain.be>
diff --git a/.ncmpcpp/error.log b/.ncmpcpp/error.log
deleted file mode 100644
index e69de29..0000000
--- a/.ncmpcpp/error.log
+++ /dev/null
diff --git a/.offlineimap/Makefile b/.offlineimap/Makefile
new file mode 100644
index 0000000..afb339c
--- /dev/null
+++ b/.offlineimap/Makefile
@@ -0,0 +1,13 @@
+HOME=/home/urbain
+TARGETS=$(HOME)/.offlineimaprc $(HOME)/.offlineimap.py
+
+all : $(TARGETS)
+
+$(HOME)/.offlineimaprc :
+	ln -s  $(PWD)/offlineimaprc $@
+
+$(HOME)/.offlineimap.py :
+	ln -s  $(PWD)/offlineimap.py $@
+
+clean :
+	rm -f $(TARGETS)
diff --git a/.uzbl/Makefile b/.uzbl/Makefile
new file mode 100644
index 0000000..1c45cec
--- /dev/null
+++ b/.uzbl/Makefile
@@ -0,0 +1,13 @@
+HOME=/home/urbain
+TARGETS=$(addprefix $(HOME)/,.config/uzbl .local/share/uzbl/bookmarks)
+
+all : $(TARGETS)
+
+$(HOME)/.config/uzbl :
+	rm -f $@ && ln -s $(PWD) $@
+
+$(HOME)/.local/share/uzbl/bookmarks :
+	rm -f $@ && ln -s $(PWD)/bookmarks $@
+
+clean :
+	rm -f $(TARGETS)
diff --git a/.vifm/vifmrc.bak b/.vifm/vifmrc.bak
deleted file mode 100644
index 81f84fa..0000000
--- a/.vifm/vifmrc.bak
+++ /dev/null
@@ -1,108 +0,0 @@
-# You can edit this file by hand.
-# The # character at the beginning of a line comments out the line.
-# Blank lines are ignored.
-# The basic format for each item is shown with an example.
-# The '=' character is used to separate fields within a single line.
-# Most settings are true = 1 or false = 0.
-
-# This is the actual command used to start vi.  The default is vi.
-# If you would like to use another vi clone such as Vim, Elvis, or Vile
-# you will need to change this setting.
-
-VI_COMMAND=vim
-# VI_COMMAND=vim
-# VI_COMMAND=elvis -G termcap
-# VI_COMMAND=vile
-
-# Trash Directory
-# The default is to move files that are deleted with dd or :d to
-# the trash directory.  1 means use the trash directory 0 means
-# just use rm.  If you change this you will not be able to move
-# files by deleting them and then using p to put the file in the new location.
-# I recommend not changing this until you are familiar with vifm.
-# This probably shouldn't be an option.
-
-USE_TRASH=1
-
-# Show only one Window
-# If you would like to start vifm with only one window set this to 1
-
-USE_ONE_WINDOW=0
-
-# Screen configuration.  If you would like to use vifm with
-# the screen program set this to 1.
-
-USE_SCREEN=0
-
-# 1 means use color if the terminal supports it.
-# 0 means don't use color even if supported.
-
-# This is how many files to show in the directory history menu.
-
-HISTORY_LENGTH=100
-
-# The sort type is how the files will be sorted in the file listing.
-# Sort by File Extension = 0
-# Sort by File Name = 1
-# Sort by Group ID = 2
-# Sort by Group Name = 3
-# Sort by Mode = 4
-# Sort by Owner ID = 5
-# Sort by Owner Name = 6
-# Sort by Size = 7
-# Sort by Time Accessed =8
-# Sort by Time Changed =9
-# Sort by Time Modified =10
-# This can be set with the :sort command in vifm.
-
-LEFT_WINDOW_SORT_TYPE=1
-
-RIGHT_WINDOW_SORT_TYPE=1
-
-# The regular expression used to filter files out of
-# the directory listings.
-# LWIN_FILTER=\.o$ and LWIN_INVERT=1 would filter out all
-# of the .o files from the directory listing. LWIN_INVERT=0
-# would show only the .o files
-
-LWIN_FILTER=\.o$
-LWIN_INVERT=1
-RWIN_FILTER=\.o$
-RWIN_INVERT=1
-
-# If you installed the vim.txt help file change this to 1.
-# If would rather use a plain text help file set this to 0.
-
-USE_VIM_HELP=0
-
-# If you would like to run an executable file when you 
-# press return on the file name set this to 1.
-
-RUN_EXECUTABLE=0
-
-# BOOKMARKS=mark=/full/directory/path=filename
-
-BOOKMARKS=H=/home/urbain=../
-BOOKMARKS=m=/home/urbain/Dropbox/phd/literature/October 14=Shear_viscosity.pdf
-BOOKMARKS=p=/home/urbain/Dropbox/phd=../
-BOOKMARKS=z=/home/urbain/.vifm=../
-
-# COMMAND=command_name=action
-# The following macros can be used in a command
-# %a is replaced with the user arguments.
-# %f the current selected file, or files.
-# %F the current selected file, or files in the other directoy.
-# %d the current directory name.
-# %D the other window directory name.
-# %m run the command in a menu window
-
-
-# The file type is for the default programs to be used with
-# a file extension. 
-# FILETYPE=description=extension1,extension2=defaultprogram, program2
-# FILETYPE=Web=html,htm,shtml=links,mozilla,elvis
-# would set links as the default program for .html .htm .shtml files
-# The other programs for the file type can be accessed with the :file command
-# The command macros %f, %F, %d, %F may be used in the commands.
-# The %a macro is ignored.  To use a % you must put %%.
-
diff --git a/.vim/Makefile b/.vim/Makefile
new file mode 100644
index 0000000..3c5fc67
--- /dev/null
+++ b/.vim/Makefile
@@ -0,0 +1,22 @@
+HOME=/home/urbain
+TARGETS=$(addprefix $(HOME)/,.vimrc .nvimrc .vim .nvim .vim/vimundo)
+
+all : $(TARGETS)
+
+$(HOME)/.vimrc :
+	rm -f $@ && ln -s $(PWD)/vimrc $@
+
+$(HOME)/.nvimrc :
+	rm -f $@ && ln -s $(PWD)/vimrc $@
+
+$(HOME)/.vim :
+	rm -f $@ && ln -s $(PWD) $@
+
+$(HOME)/.nvim :
+	rm -f $@ && ln -s $(PWD) $@
+
+$(HOME)/.vim/vimundo :
+	mkdir -p $@
+
+clean :
+	rm -f $(TARGETS)
diff --git a/.vim/colors/mine.vim~ b/.vim/colors/mine.vim~
deleted file mode 100644
index 653682e..0000000
--- a/.vim/colors/mine.vim~
+++ /dev/null
@@ -1,29 +0,0 @@
-" Vim color file
-"  Maintainer: Urbain
-" Last Change: 2002/10/14 Mon 16:41.
-"     version: 1.0
-" This color scheme uses a light background.
-
-set background=light
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let colors_name = "mine"
-
-" Syntax group
-hi Comment gui=none guifg=#af5f00
-hi Normal guibg=white guifg=Black
-hi Type gui=none guifg=#005f00
-hi Statement gui=none guifg=#5f0000
-hi Special guifg=Black
-hi Constant guifg=Gray
-hi Error guifg=Red guibg=White
-hi Preproc guifg=Blue "\end
-hi Constant guifg=Green "\ $$
-hi Identifier guifg=Blue "\begin
-hi LineNr gui=none guifg=Gray
-hi FoldColumn guibg=#F5F4FD
-hi Todo guibg=white gui=underline,italic guifg=Red
-hi Conceal guibg=White guifg=DarkGreen
diff --git a/.vim/vim-plug b/.vim/vim-plug
new file mode 160000
+Subproject 86e75e5d0859b99d3b527a92e6489984ff2eb05
diff --git a/.vim/vimrc b/.vim/vimrc
index 0f3b57b..203c5fc 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -292,7 +292,7 @@ nnoremap <silent> <Leader>C :call fzf#run({
 \ })<CR>
 
 "" Experimental
-let g:notes_directories = ['~/.notes']
+let g:notes_directories = ['~/dotfiles/private/.notes']
 let g:pymode=0
 
 " Idea: instant download colorscheme
diff --git a/.zathura/Makefile b/.zathura/Makefile
new file mode 100644
index 0000000..e8c3e11
--- /dev/null
+++ b/.zathura/Makefile
@@ -0,0 +1,10 @@
+HOME=/home/urbain
+TARGET=$(HOME)/.config/zathura/zathurarc
+
+all : $(TARGETS)
+
+$(HOME)/.config/zathura/zathurarc :
+	rm -f $@ && ln -s $(PWD)/zathurarc $@
+
+clean :
+	rm -f $(TARGET)
diff --git a/.zathurarc b/.zathura/zathurarc
index 543633d..543633d 100644
--- a/.zathurarc
+++ b/.zathura/zathurarc
diff --git a/.zsh/Makefile b/.zsh/Makefile
new file mode 100644
index 0000000..3593740
--- /dev/null
+++ b/.zsh/Makefile
@@ -0,0 +1,13 @@
+HOME=/home/urbain
+TARGETS=$(addprefix $(HOME)/,.zsh .zshrc)
+
+all : $(TARGETS)
+
+$(HOME)/.zshrc :
+	rm -f $@ && ln -s $(PWD)/zshrc $@
+
+$(HOME)/.zsh :
+	rm -f $@ && ln -s $(PWD) $@
+
+clean :
+	rm -f $(TARGETS)
diff --git a/.zsh/tmp b/.zsh/tmp
deleted file mode 100644
index aab86c2..0000000
--- a/.zsh/tmp
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/zsh
-
-export COLORSCHEME=light
diff --git a/install.sh b/install.sh
index d165f5a..c06d497 100755
--- a/install.sh
+++ b/install.sh
@@ -1,101 +1,28 @@
-#!/bin/zsh
+#! /bin/bash
 
-HOME=/home/urbain
-dotdir=$HOME/dotfiles
+dotdir=/home/urbain/dotfiles
 
-unset dotdirs install uninstall
-declare -A dotdirs install uninstall
 
-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
-
-install_offlineimap() {
-    ln -s $dotdir/.offlineimap/offlineimaprc .offlineimaprc
-    ln -s $dotdir/.offlineimap/offlineimap.py .offlineimap.py
-}
-
-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
-}
-
-install_zsh() {
-    ln -s $dotdir/.zsh/zshrc .zshrc
-    ln -s $dotdir/.zsh .zsh
-}
-
-install_uzbl() {
-    ln -s $dotdir/.uzbl uzbl
-    cd $HOME/.local/share/uzbl
-    ln -s $dotdir/.uzbl/bookmarks bookmarks
-}
-
-uninstall_offlineimap() {
-    rm -f .offlineimaprc
-    rm -f .offlineimap.py
-}
-
-uninstall_vim() {
-    rm -rf .vim .vimrc .nvim .nvimrc
-}
-
-uninstall_zsh() {
-    rm -rf .zsh .zshrc
-}
-
-uninstall_uzbl() {
-    rm -rf uzbl
-    rm -f $HOME/.local/share/uzbl/bookmarks
+install_dotfiles() {
+    for file in `ls -A --ignore="install.sh" --ignore="README.md" --ignore=".git*"`; do
+        if [[ -f $file/Makefile ]]; then
+            cd $file && make && cd $dotdir
+        else
+            rm -f $HOME/$file && ln -s $dotdir/$file $HOME/$file
+        fi
+    done
 }
 
-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'
-install[.uzbl]='install_uzbl'
-
-uninstall[.offlineimap]='uninstall_offlineimap'
-uninstall[.vim]='uninstall_vim'
-uninstall[.zsh]='uninstall_zsh'
-uninstall[.uzbl]='uninstall_uzbl'
 
 clean_dotfiles() {
-    for file in ${(@k)dotdirs}; do
-	echo "Cleaning $file"
-        cd $(dirname $dotdirs[$file])
-        eval ${uninstall[$file]}
+    for file in `ls -A --ignore="install.sh" --ignore="README.md" --ignore=".git*"`; do
+        if [[ -f $file/Makefile ]]; then
+            cd $file && make clean && cd $dotdir
+        else
+            rm -f $HOME/$file
+        fi
     done
 }
 
-install_dotfiles() {
-    for file in ${(@k)dotdirs}; do
-	echo "Installing $file"
-        cd $(dirname $dotdirs[$file])
-        eval ${install[$file]}
-    done
-}
-
-function install_packages {
-    sudo apt-get install ttyrec mutt msmtp offlineimap wmctrl rxvt-unicode-256color \
-        tmux git gcc clang cmake make zathura feh chromium-browser zsh clang xcape
-}
-
 clean_dotfiles
 install_dotfiles