Add various changes

18 files changed, 475 insertions, 120 deletions

diff --git a/bookmarks b/bookmarks
index 516474d..a9fe2ae 100644
--- a/bookmarks
+++ b/bookmarks
@@ -1,9 +1,9 @@
-report : /home/urbain/Dropbox/phd/reports/esa
 paper : /home/urbain/Dropbox/phd/papers/spectral
+presentation : /home/urbain/Dropbox/phd/presentations/spectral
+github : /home/urbain/github
+develop : /home/urbain/Dropbox/phd/code/spectral/develop
 dotfiles : /home/urbain/dotfiles
 phd : /home/urbain/Dropbox/phd
 code : /home/urbain/Dropbox/phd/code/spectral
 feature : /home/urbain/Dropbox/phd/code/spectral/feature
-presentation : /home/urbain/Dropbox/phd/presentations/spectral
-develop : /home/urbain/Dropbox/phd/code/spectral/develop
-github : /home/urbain/github
+report : /home/urbain/Dropbox/phd/reports/esa
diff --git a/discours b/discours
deleted file mode 100644
index 107952b..0000000
--- a/discours
+++ /dev/null
@@ -1,4 +0,0 @@
-Chers amis, 
-
-nous sommes reunis aujourd'hui pour celebrer le mariage de Catherine et Victor. 
-Nous allons commencer par quelques annecdote que nous avons eu 
diff --git a/i3/config b/i3/config
index 0d02a52..02dad94 100644
--- a/i3/config
+++ b/i3/config
@@ -30,20 +30,20 @@ floating_modifier $mod
 bindsym $mod+Return exec i3-sensible-terminal
 
 # kill focused window
-bindsym $mod+Shift+Q kill
+bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run
+# 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
+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
+bindsym $mod+n focus down
+bindsym $mod+p focus up
+bindsym $mod+l focus right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
@@ -52,10 +52,10 @@ 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
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+n move down
+bindsym $mod+Shift+p move up
+bindsym $mod+Shift+l move right
 
 # alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
@@ -64,7 +64,7 @@ bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
-# bindsym $mod+n split h
+bindsym $mod+w split h
 
 # split in vertical orientation
 bindsym $mod+v split v
@@ -73,9 +73,9 @@ bindsym $mod+v split v
 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
+bindsym $mod+g layout stacking
+bindsym $mod+t layout tabbed
+bindsym $mod+s layout toggle split
 
 # toggle tiling / floating
 bindsym $mod+Shift+space floating toggle
@@ -84,41 +84,48 @@ bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 
 # focus the parent container
-bindsym $mod+a focus parent
+bindsym $mod+a focus parent # ancestor
 
 # focus the child container
-#bindsym $mod+d focus child
+bindsym $mod+c focus child
+
+# move the currently focused window to the scratchpad
+bindsym $mod+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 $mod+minus scratchpad show
 
 # 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
+bindsym $mod+ampersand workspace 1
+bindsym $mod+bracketleft workspace 2
+bindsym $mod+braceleft workspace 3
+bindsym $mod+braceright workspace 4
+bindsym $mod+parenleft workspace 5
+bindsym $mod+equal workspace 6
+bindsym $mod+asterisk workspace 7
+bindsym $mod+parenright workspace 8
+bindsym $mod+plus workspace 9
+bindsym $mod+bracketright 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
+bindsym $mod+Shift+ampersand move container to workspace 1
+bindsym $mod+Shift+bracketleft move container to workspace 2
+bindsym $mod+Shift+braceleft move container to workspace 3
+bindsym $mod+Shift+braceright move container to workspace 4
+bindsym $mod+Shift+1 move container to workspace 5
+bindsym $mod+Shift+equal move container to workspace 6
+bindsym $mod+Shift+asterisk move container to workspace 7
+bindsym $mod+Shift+2 move container to workspace 8
+bindsym $mod+Shift+plus move container to workspace 9
+bindsym $mod+Shift+bracketright move container to workspace 10
 
 # reload the configuration file
-bindsym $mod+Shift+C reload
+bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+R restart
+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'"
+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" {
@@ -128,10 +135,10 @@ mode "resize" {
         # 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
+        bindsym h resize shrink width 10 px or 10 ppt
+        bindsym t resize grow height 10 px or 10 ppt
+        bindsym p resize shrink height 10 px or 10 ppt
+        bindsym l 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
@@ -144,8 +151,7 @@ mode "resize" {
         bindsym Escape mode "default"
 }
 
-# bindsym $mod+r mode "resize"
-bindsym $mod+m exec /home/urbain/.i3/winmenu.py
+bindsym $mod+r mode "resize"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
@@ -153,4 +159,4 @@ bar {
         status_command i3status
 }
 
-exec_always i3-init
+exec $HOME/.xinitrc
diff --git a/i3/config.bak b/i3/config.bak
new file mode 100644
index 0000000..0d02a52
--- /dev/null
+++ b/i3/config.bak
@@ -0,0 +1,156 @@
+# 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
new file mode 100644
index 0000000..5f657a6
--- /dev/null
+++ b/i3/config.working
@@ -0,0 +1,176 @@
+# 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
index 367b37a..32193b1 100755
--- a/i3/i3-init
+++ b/i3/i3-init
@@ -1,2 +1,3 @@
 setxkbmap -layout us -variant dvp
-xrdb ~/.Xresources
+xrdb /home/urbain/.Xresources
+/home/urbain/.xmodmap
diff --git a/notes/Notes b/notes/Notes
new file mode 100644
index 0000000..e61df80
--- /dev/null
+++ b/notes/Notes
@@ -0,0 +1,24 @@
+Notes
+
+# Phd Todos
+
+   • High priority
+      ◦ Investigate proof of spectral convergence
+   • Medium priority
+      ◦ Implement Smolyak algorithm
+      ◦ Investigate proof of weak convergence
+      ◦ Obtain rigourous homogenization result
+   • Low priority
+      ◦ Add graphs to program
+
+# General Todos
+   • High priority
+   • Medium priority
+      ◦ Clean flat
+   • Low priority
+      ◦ Clean room
+
+                                     * * *
+
+# Useful info
+   • Bank number: 930630876
diff --git a/notes/Personal notes b/notes/Personal notes
deleted file mode 100644
index 5f03559..0000000
--- a/notes/Personal notes
+++ /dev/null
@@ -1,23 +0,0 @@
-Personal notes
-
-# Personal TODO list
-   • Prepare speech wedding
-   • Repay Arnaud
-
-                                     * * *
-
-# PhD TODO list
-   • 9 months report
-   • Article by Virginie
-
-                                     * * *
-
-# Admin
-   • Expense claims
-      ◦ Distribution textbook
-      ◦ Train tickets
-
-                                     * * *
-
-# Useful info
-   • Bank number: 930630876
diff --git a/passwords/main.asc b/passwords/main.asc
index a31d6c3..1594783 100644
--- a/passwords/main.asc
+++ b/passwords/main.asc
@@ -1,18 +1,18 @@
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v1
 
-hQIMA2AwAsuYqCfXAQ/+OoXBGvfhxrv1n/kR2h8Q4/jwhjQ+UlrL/F7bk3BR/ggy
-dHhH230/Bcet4DzjBSqvC4UrxtWDLu2+Q+C1WaiIRgQ6Dor/aTx4ouJbJfMQhIH2
-zayNTWRoqsJ08NwTd0q4kVXkYF0R/rHdgMX6ornaW2sN3wAxd/3wMBNYbDlMr7Es
-ga9tCKHggMrOS/D1+JnxqK8akrNO3AmJoAjMUDxu59+DPGirVrq92GuTH6du/Gb2
-diCaE9ruVHpPZh2UOIU/4EWbiqP5Pr2U7PnUmW6E7Dm7yu/488op4XA0Uda4hUEB
-BoNTBcYt7An/+ZP5ve4EHOLGB/VALjqYhVbwLDQATfAg8gtkEmCohTy9EAFUKOZY
-3xIi/+7OElZBikBMkKhieccG99QvNLwRbzVie1IkhefFuRipytidZ28WgoFFGf/R
-izP+UjwmHRqYyNWrobBszmCogE3cpU5urk4iZCBMlwpqkeUFi01aPzRgaDBbCn2j
-9MML2xJZvz2/itHCjGsb5u0tlp1ItIk/Lg3Uh1UFyyxxZuIPbCWeCZ+sK0Kq8wPC
-E34Sri3Pa60dOWIkf7zPVpR8oE6CCq8X8/taDLAdCzvadG7qt4YALlGn2W8sgN7G
-y0aAKafA6IvLgXx5jQZ45jBEYbvAQ39bSjpXY1AS6TlU2aqTh3VgBHvHzjube/nS
-TQFRL4q9jgt2jhpPKYD8RLGhtHAUtKaEINpSAfzdbqVaQDAMX+a9vCTRvLcmhaOj
-Nk2LrgAT2RGc3q04Nfo3pZ7qE0j6hRy2xrMoQggc
-=2CB6
+hQIMA2AwAsuYqCfXAQ//Rh9CxPBXFCTJWb50Leo+ajlLyNp24f18iKgHajWCWl+L
+LnHZULza+gGDCZ0nCx5j0R8KLLmzBm7OtHQeinGt6GA5hn6eswjHUhRK5JJmmaU/
+0YICerPyxAMwb/ilseH9dzyJEWsfh37vK8+ErxlsaOSDseWTGpI9rSAo2jUucx3C
+0HJo1mXz6CTFjqy/DzwVnuXWEB4eFLyp7u68oHUK8OB2hWAVNjqTEZO5hAfpC/+A
+b2a1UKUdPMxTOkyfj7BcZN2vQZbw/j/h4LzLcu6CulpC5qG2/n4zFfoHyKNlzKGg
+SLzilb2dRLz572jVuyHwfvU2qjbty/py5uuyxjSermmi1vRbgHxEEJ3zKARTKePb
+9IxxBRFej4N7QHyU9HSIwMcq/5F0wanTddr9gpmA6KJDbJ+X5OKJ16TtNj2gbj7w
+re2EFoms5EKOiDplTo9A0ssUzvN4mNmip9JbGKOf5s6kCgkBGVU4Zreo+Rv7h9B1
+x+42TjozDOkOsyikW+wVCWl6K32SgVREXeBhG1t9Z1QQCdHKWNi/oc5lreisX+co
+3mQepxyk7/ypLJOxkyUjLqfVmLQUwZ/DLbtnYITA9XmuwfeAlRThj0LhVT4eRjW5
+/fxvTee2bbNp89nBSUv1CbW/DVkgCY82QsOMuI1RbYxjnN9zV/VEM+j9O9EEJGjS
+SwFdNekRg7yThIt1NpeYZO5CYbxF6dPE4bK7Xk3mBnlK1mfN13DiGZQLQBcbdLhE
+NsllvDHSGxV6JZ5SQWlX2tV7jdnt2mzsGV0OTQ==
+=wQzI
 -----END PGP MESSAGE-----
diff --git a/repos.zsh b/repos.zsh
index 2d0326f..4a0a2fa 100644
--- a/repos.zsh
+++ b/repos.zsh
@@ -1,5 +1,4 @@
-declare -A repodirs
-declare -A actions
+declare -A repodirs install
 
 # General purpose
 repodirs[icholy/ttygif]=/home/urbain/github/ttygif
@@ -19,8 +18,12 @@ repodirs[atweiden/fzf-extras]=/home/urbain/github/fzf-extras
 # Plugin managers
 repodirs[junegunn/vim-plug]=/home/urbain/.vim/vim-plug
 repodirs[tmux-plugins/tpm]=/home/urbain/.tmux/plugins/tpm
-# repodirs[tarjoilija/zgen]=/home/urbain/.zgen
+repodirs[tarjoilija/zgen]=/home/urbain/.zgen
 
+# Experimental
+repodirs[adbrebs/taxi]=/home/urbain/github/taxi
+
+# Installation
 function after_vimplug {
     cd ..
     rm -rf autoload
@@ -29,8 +32,10 @@ function after_vimplug {
     ln -s ../vim-plug/plug.vim;
 }
 
-declare -A actions
-actions[alols/xcape]='make'
-actions[icholy/ttygif]='make'
-actions[junegunn/fzf]='./install'
-actions[junegunn/vim-plug]='after_vimplug'
+install[alols/xcape]='make'
+install[icholy/ttygif]='make'
+install[junegunn/fzf]='./install'
+install[junegunn/vim-plug]='after_vimplug'
+
+# Uninstallation
+uninstall[junegunn/fzf]='./uninstall'
diff --git a/sed b/sed
deleted file mode 100644
index 4e4198d..0000000
--- a/sed
+++ /dev/null
@@ -1,11 +0,0 @@
-		repodirs[alols/xcape]=$home/xcape
-		repodirs[altercation/mutt-colors-solarized]=$home/github/mutt-colors-solarized
-		repodirs[atweiden/fzf-extras]=$home/github/fzf-extras
-		repodirs[icholy/ttygif]=$home/github/ttygif
-		repodirs[junegunn/fzf]=$home/.fzf
-		repodirs[junegunn/vim-plug]=$dir/vim/vim-plug
-repodirs[seebi/dircolors-solarized]=$home/github/dircolors
-		repodirs[tarjoilija/zgen]=$home/.zgen
-		repodirs[tmux-plugins/tpm]=$home/.tmux/plugins/tpm
-		repodirs[uvaes/fzf-marks]=$home/github/fzf-marks
-		repodirs[uvaes/grm]=$home/github/grm s/^[^[].*\(\[.*\]\).*$/\1/g
diff --git a/todo b/todo
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/todo
diff --git a/vim/.netrwhist b/vim/.netrwhist
index 637791c..a536ddd 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,5 +1,8 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =6
 let g:netrw_dirhist_1='/home/urbain/Dropbox/phd/code/spectral/develop/cpp'
 let g:netrw_dirhist_2='/home/urbain/dotfiles'
 let g:netrw_dirhist_3='/home/urbain'
+let g:netrw_dirhist_4='/home/urbain/dotfiles'
+let g:netrw_dirhist_5='/home/urbain/Dropbox/phd/code/spectral/feature/cpp/src'
+let g:netrw_dirhist_6='/etc/NetworkManager'
diff --git a/vimrc b/vimrc
index f1304d9..2558fe1 100644
--- a/vimrc
+++ b/vimrc
@@ -13,7 +13,7 @@ Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
 Plug 'itchyny/calendar.vim', { 'on' : 'Calendar' }
 Plug 'klen/python-mode'
-Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
+Plug 'jamessan/vim-gnupg'
 Plug 'junegunn/fzf'
 Plug 'junegunn/seoul256.vim'
 Plug 'junegunn/vim-pseudocl'
@@ -50,8 +50,8 @@ Plug 'tpope/vim-vinegar'
 Plug 'troydm/zoomwintab.vim'
 Plug 'Valloric/YouCompleteMe'
 ", { 'do' : './install.sh --clang-completer' }
-Plug 'xolox/vim-misc', { 'on' : 'Note' }
-Plug 'xolox/vim-notes', { 'on' : 'Note' }
+Plug 'xolox/vim-misc'
+Plug 'xolox/vim-notes'
 call plug#end()
 
 let g:vimtex_fold_enabled=0
diff --git a/xinitrc b/xinitrc
new file mode 100755
index 0000000..493029b
--- /dev/null
+++ b/xinitrc
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Key repeat rate
+xset r rate 200 50
+
+# Dvorak programer
+setxkbmap us -variant dvp
+
+# Load key bindings
+$HOME/.xmodmap
+
+# Set colorscheme to light
+export COLORSCHEME=light
+
+# Load Xresources to light colorscheme
+xrdb $HOME/.Xresources.light
diff --git a/xmodmap b/xmodmap
index 86d827f..2c2fd7e 100755
--- a/xmodmap
+++ b/xmodmap
@@ -29,5 +29,9 @@ xmodmap -e "keycode 32 = r R 9"
 # Dollars, symbols hard to reach
 xmodmap -e "keycode 47 = s S dollar"
 
-/home/urbain/xcape/xcape -e 'Control_L=Escape'
-/home/urbain/xcape/xcape -e 'Shift_L=Escape'
+xcape -e 'Control_L=Escape'
+xcape -e 'Shift_L=Escape'
+
+# Map alt-gr to alt
+# xmodmap -e 'clear mod5'
+# xmodmap -e 'add mod1 = Mode_switch'
diff --git a/xsession b/xsession
new file mode 120000
index 0000000..5539532
--- /dev/null
+++ b/xsession
@@ -0,0 +1 @@
+xinitrc
\ No newline at end of file
diff --git a/zshrc b/zshrc
index 4e3c2ce..b5e1afc 100644
--- a/zshrc
+++ b/zshrc
@@ -1,4 +1,4 @@
-Load zgen
+# Load zgen
 source "/home/urbain/.zgen/zgen.zsh"
 
 if ! zgen saved; then
@@ -26,7 +26,7 @@ if ! zgen saved; then
 
     # My plugins
     zgen load uvaes/fzf-marks
-    # zgen load uvaes/grm
+    zgen load uvaes/grm
 
     # Other plugins
     zgen load rupa/z
@@ -60,6 +60,7 @@ zle -N zle-line-init
 
 # User configuration
 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
@@ -102,7 +103,7 @@ alias update='sudo apt-get update'
 alias upgrade='sudo apt-get upgrade'
 alias v='vim'
 alias x='sh ~/.xmodmap'
-alias xcape='/home/urbain/xcape/xcape'
+alias youtube=mpsyt
 
 # Configuration
 alias em="$EDITOR ~/.mutt/muttrc"