Use GNU stow for dotfiles management

112 files changed, 211 insertions, 123 deletions

diff --git a/.dotmap b/.dotmap
deleted file mode 100644
index f3a6946..0000000
--- a/.dotmap
+++ /dev/null
@@ -1,35 +0,0 @@
-declare -A dotmap
-dotmap[$HOME/.bashrc]=$HOME/dotfiles/bashrc
-dotmap[$HOME/bin]=$HOME/dotfiles/bin
-dotmap[$HOME/.config/dunst/dunstrc]=$HOME/dotfiles/dunstrc
-dotmap[$HOME/.config/i3/config]=$HOME/dotfiles/i3/config
-dotmap[$HOME/.config/i3status/config]=$HOME/dotfiles/i3/i3status.conf
-dotmap[$HOME/.config/newsbeuter]=$HOME/dotfiles/newsbeuter
-dotmap[$HOME/.config/nvim]=$HOME/dotfiles/vim
-dotmap[$HOME/.config/qutebrowser]=$HOME/dotfiles/qutebrowser
-dotmap[$HOME/.config/zathura/zathurarc]=$HOME/dotfiles/zathurarc
-dotmap[$HOME/.gitconfig]=$HOME/dotfiles/gitconfig
-dotmap[$HOME/.git_template]=$HOME/dotfiles/git_template
-dotmap[$HOME/.inputrc]=$HOME/dotfiles/inputrc
-dotmap[$HOME/.latexmkrc]=$HOME/dotfiles/latexmkrc
-dotmap[$HOME/.ledgerrc]=$HOME/dotfiles/ledgerrc
-dotmap[$HOME/.local/share/qutebrowser/userscripts]=$HOME/dotfiles/qutebrowser/userscripts
-dotmap[$HOME/.mbsyncrc]=$HOME/dotfiles/mbsyncrc
-dotmap[$HOME/.mrconfig]=$HOME/dotfiles/mr/mrconfig
-dotmap[$HOME/.mrtrust]=$HOME/dotfiles/mr/mrtrust
-dotmap[$HOME/.msmtprc]=$HOME/dotfiles/msmtprc
-dotmap[$HOME/.mutt]=$HOME/dotfiles/mutt
-dotmap[$HOME/.ncmpcpp]=$HOME/dotfiles/ncmpcpp
-dotmap[$HOME/.password-store]=$HOME/dotfiles/passwords
-dotmap[$HOME/.surfraw.bookmarks]=$HOME/dotfiles/surfraw.bookmarks
-dotmap[$HOME/.tmux.conf]=$HOME/dotfiles/tmux.conf
-dotmap[$HOME/.urxvt]=$HOME/dotfiles/urxvt
-dotmap[$HOME/.vifm]=$HOME/dotfiles/vifm
-dotmap[$HOME/.vim]=$HOME/dotfiles/vim
-dotmap[$HOME/.vimperatorrc]=$HOME/dotfiles/vimperatorrc
-dotmap[$HOME/.vimrc]=$HOME/dotfiles/vim/vimrc
-dotmap[$HOME/.xinitrc]=$HOME/dotfiles/xinitrc
-dotmap[$HOME/.Xresources]=$HOME/dotfiles/Xresources
-dotmap[$HOME/.zgen]=$HOME/dotfiles/zsh/zgen
-dotmap[$HOME/.zsh]=$HOME/dotfiles/zsh
-dotmap[$HOME/.zshrc]=$HOME/dotfiles/zsh/zshrc
diff --git a/.gitignore b/.gitignore
index baaed72..3e76755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,9 @@
 gitolite
 ledger
-mutt/attachments/*
-mutt/cache/*
-mutt/solarized
-mutt/temp/*
 passwords
 personal
-qutebrowser/qsettings
-urxvt/ext
-vifm/Trash
-vifm/vifminfo*
-vifm/vimfiles
-vim/.netrwhist
-vim/plugged
-vim/vim-plug
-vim/vimundo/*
-zsh/tmp
-zsh/zgen
+urxvt/ext/.git
+zsh/.zsh/tmp
+zsh/.zsh/zgen
 
 !*.gitkeep
diff --git a/Xresources/base b/Xresources/.Xresources/base
index fac93e4..6a17306 100644
--- a/Xresources/base
+++ b/Xresources/.Xresources/base
@@ -12,7 +12,7 @@ URxvt.clipboard.copycmd:  xclip -i -selection clipboard
 URxvt.clipboard.pastecmd: xclip -o -selection clipboard
 
 ! Perl extensions configuration
-URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select
+URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,resize
 URxvt.url-select.launcher: /usr/bin/qutebrowser
 URxvt.url-select.underline: true
 
@@ -22,6 +22,8 @@ URxvt.keysym.M-s: perl:keyboard-select:search
 URxvt.keysym.M-u: perl:url-select:select_next
 URxvt.keysym.M-y: perl:clipboard:copy
 URxvt.keysym.M-p: perl:clipboard:paste
+URxvt.resize-font.smaller: C-minus
+URxvt.resize-font.bigger: C-plus
 
 ! Appearance
 URxvt*font: xft:DejaVu Sans Mono:size=12
diff --git a/Xresources/dark b/Xresources/.Xresources/dark
index 1c51f21..1c51f21 100644
--- a/Xresources/dark
+++ b/Xresources/.Xresources/dark
diff --git a/Xresources/light b/Xresources/.Xresources/light
index c4b962d..c4b962d 100644
--- a/Xresources/light
+++ b/Xresources/.Xresources/light
diff --git a/Xresources/seoul b/Xresources/.Xresources/seoul
index 8b282e9..8b282e9 100644
--- a/Xresources/seoul
+++ b/Xresources/.Xresources/seoul
diff --git a/Xresources/transparent b/Xresources/.Xresources/transparent
index b3c2d8e..b3c2d8e 100644
--- a/Xresources/transparent
+++ b/Xresources/.Xresources/transparent
diff --git a/bashrc b/bash/.bashrc
index e4cd4ff..e4cd4ff 100644
--- a/bashrc
+++ b/bash/.bashrc
diff --git a/bin/books b/bin/bin/books
index 8524277..8524277 100755
--- a/bin/books
+++ b/bin/bin/books
diff --git a/bin/dot b/bin/bin/dot
index acb0e64..acb0e64 100755
--- a/bin/dot
+++ b/bin/bin/dot
diff --git a/bin/downloads b/bin/bin/downloads
index c4c306e..c4c306e 100755
--- a/bin/downloads
+++ b/bin/bin/downloads
diff --git a/bin/email b/bin/bin/email
index 84e923e..84e923e 100755
--- a/bin/email
+++ b/bin/bin/email
diff --git a/bin/i3-shell b/bin/bin/i3-shell
index 120e4b4..120e4b4 100755
--- a/bin/i3-shell
+++ b/bin/bin/i3-shell
diff --git a/bin/id b/bin/bin/id
index 7dad85d..7dad85d 100755
--- a/bin/id
+++ b/bin/bin/id
diff --git a/bin/keyboard b/bin/bin/keyboard
index 5a96bcb..5a96bcb 100755
--- a/bin/keyboard
+++ b/bin/bin/keyboard
diff --git a/bin/mystatus b/bin/bin/mystatus
index b26e9b6..b26e9b6 100755
--- a/bin/mystatus
+++ b/bin/bin/mystatus
diff --git a/bin/password b/bin/bin/password
index 065672b..065672b 100755
--- a/bin/password
+++ b/bin/bin/password
diff --git a/bin/recolor b/bin/bin/recolor
index edd5fa5..edd5fa5 100755
--- a/bin/recolor
+++ b/bin/bin/recolor
diff --git a/bin/rename_workspace b/bin/bin/rename_workspace
index 7636fd2..7636fd2 100755
--- a/bin/rename_workspace
+++ b/bin/bin/rename_workspace
diff --git a/bin/run b/bin/bin/run
index 4b57856..8ca03eb 100755
--- a/bin/run
+++ b/bin/bin/run
@@ -1,5 +1,5 @@
 #!/bin/bash
-SCRIPTS_DIR="$HOME/dotfiles/bin" && cd $SCRIPTS_DIR
+SCRIPTS_DIR="$HOME/bin" && cd $SCRIPTS_DIR
 SCRIPTS=$(ls -A $SCRIPTS_DIR)
 TARGET=$(echo "${SCRIPTS//"$SCRIPTS_DIR/"/}" | dmenu -i -p "Run script:")
 [[ -n $TARGET ]] && "$SCRIPTS_DIR/$TARGET"
diff --git a/bin/swap b/bin/bin/swap
index 4c17dc7..4c17dc7 100755
--- a/bin/swap
+++ b/bin/bin/swap
diff --git a/bin/tldr b/bin/bin/tldr
index 2b294c0..2b294c0 100755
--- a/bin/tldr
+++ b/bin/bin/tldr
diff --git a/bin/tmux_attach b/bin/bin/tmux_attach
index 564e3bb..564e3bb 100755
--- a/bin/tmux_attach
+++ b/bin/bin/tmux_attach
diff --git a/bin/touchpad b/bin/bin/touchpad
index 17649fa..17649fa 100755
--- a/bin/touchpad
+++ b/bin/bin/touchpad
diff --git a/bin/vimin b/bin/bin/vimin
index 905b30f..905b30f 100755
--- a/bin/vimin
+++ b/bin/bin/vimin
diff --git a/bin/workspace b/bin/bin/workspace
index a22511e..a9e4aa0 100755
--- a/bin/workspace
+++ b/bin/bin/workspace
@@ -11,7 +11,7 @@ workspaces=$(i3-msg -t get_workspaces | grep -Po '"name":.*?[^\\]"' | sed 's/"na
 workspaces=$(echo $workspaces | sed '/:/!d')
 
 # Get desired workspace
-target=$(echo $workspaces | dmenu -i -sf green -p "Go to workspace:")
+target=$(echo $workspaces | dmenu -b -i -sf green -p "Go to workspace:")
 
 # Exit if empty
 [[ -z $target ]] && exit
diff --git a/crontab b/crontab
deleted file mode 100644
index 6f1c80a..0000000
--- a/crontab
+++ /dev/null
@@ -1 +0,0 @@
-*/5 * * * * $HOME/bin/email >> $HOME/.cron_email_log
diff --git a/dunstrc b/dunst/.config/dunst/dunstrc
index 3fcc5be..3fcc5be 100644
--- a/dunstrc
+++ b/dunst/.config/dunst/dunstrc
diff --git a/git_template/hooks/ctags b/git/.git_template/hooks/ctags
index a9a2150..a9a2150 100755
--- a/git_template/hooks/ctags
+++ b/git/.git_template/hooks/ctags
diff --git a/git_template/hooks/post-checkout b/git/.git_template/hooks/post-checkout
index 84f17ed..84f17ed 100755
--- a/git_template/hooks/post-checkout
+++ b/git/.git_template/hooks/post-checkout
diff --git a/git_template/hooks/post-commit b/git/.git_template/hooks/post-commit
index 84f17ed..84f17ed 100755
--- a/git_template/hooks/post-commit
+++ b/git/.git_template/hooks/post-commit
diff --git a/git_template/hooks/post-merge b/git/.git_template/hooks/post-merge
index 84f17ed..84f17ed 100755
--- a/git_template/hooks/post-merge
+++ b/git/.git_template/hooks/post-merge
diff --git a/git_template/hooks/post-rewrite b/git/.git_template/hooks/post-rewrite
index fe8972d..fe8972d 100755
--- a/git_template/hooks/post-rewrite
+++ b/git/.git_template/hooks/post-rewrite
diff --git a/gitconfig b/git/.gitconfig
index 0e6c6f7..0e6c6f7 100644
--- a/gitconfig
+++ b/git/.gitconfig
diff --git a/i3/config b/i3/.config/i3/config
index ffed0bd..ffed0bd 100644
--- a/i3/config
+++ b/i3/.config/i3/config
diff --git a/i3/i3status.conf b/i3/.config/i3status/config
index 8561697..8561697 100644
--- a/i3/i3status.conf
+++ b/i3/.config/i3status/config
diff --git a/inputrc b/input/inputrc
index 1221bb9..1221bb9 100644
--- a/inputrc
+++ b/input/inputrc
diff --git a/latexmkrc b/latexmk/.latexmkrc
index e9b5c76..e9b5c76 100644
--- a/latexmkrc
+++ b/latexmk/.latexmkrc
diff --git a/ledgerrc b/ledgerrc
deleted file mode 100644
index 4fb9118..0000000
--- a/ledgerrc
+++ /dev/null
@@ -1,2 +0,0 @@
---pager /bin/less
---file ~/dotfiles/ledger/perso.ledger
diff --git a/mbsyncrc b/mbsync/.mbsyncrc
index 08a006e..08a006e 100644
--- a/mbsyncrc
+++ b/mbsync/.mbsyncrc
diff --git a/misc/.gtkrc-2.0.mine b/misc/.gtkrc-2.0.mine
deleted file mode 100644
index 4e2ec82..0000000
--- a/misc/.gtkrc-2.0.mine
+++ /dev/null
@@ -1,5 +0,0 @@
-style "uzbl" {
-      GtkRange::slider-width = 0
-      GtkRange::trough-border = 0
-}
-widget "Uzbl*" style "uzbl"
diff --git a/misc/20-keyboard.conf b/misc/20-keyboard.conf
deleted file mode 100644
index 33cf6ed..0000000
--- a/misc/20-keyboard.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-    Identifier "keyboard"
-    MatchIsKeyboard "yes"
-    Option "XkbLayout" "us"
-    Option "XkbVariant" "dvp"
-EndSection
diff --git a/mr/mrconfig b/mr/mrconfig
index a142ae8..7299c7e 100644
--- a/mr/mrconfig
+++ b/mr/mrconfig
@@ -1,40 +1,40 @@
-[/home/urbain/dotfiles]
+[$HOME/dotfiles]
 checkout = git clone 'git@urbainvaes.com:dotfiles.git' 'dotfiles'
 update = git pull origin master
 push = git push origin master
 
-[/home/urbain/dotfiles/gitolite]
+[$HOME/gitolite]
 checkout = git clone 'git@urbainvaes.com:gitolite-admin.git' 'gitolite'
 update = git pull origin master
 push = git push origin master
 
-[/home/urbain/dotfiles/ledger]
+[$HOME/ledger]
 checkout = git clone 'git@urbainvaes.com:private/ledger.git' 'ledger'
 update = git pull origin master
 push = git push origin master
 
-[/home/urbain/dotfiles/passwords]
-checkout = git clone 'git@urbainvaes.com:private/passwords.git' 'passwords'
+[$HOME/.password-store]
+checkout = git clone 'git@urbainvaes.com:private/passwords.git' '.password-store'
 update = git pull origin master
 push = git push origin master
 
-[/home/urbain/dotfiles/personal]
+[$HOME/personal]
 checkout = git clone 'git@urbainvaes.com:private/personal.git' 'personal'
 update = git pull origin master
 push = git push origin master
 
-[/home/urbain/dotfiles/vim/vim-plug]
+[$HOME/.vim/vim-plug]
 checkout = git clone 'https://github.com/junegunn/vim-plug' 'vim-plug'
 skip = [ "$1" = push ]
 
-[/home/urbain/dotfiles/mutt/solarized]
+[$HOME/.mutt/solarized]
 checkout = git clone 'https://github.com/altercation/mutt-colors-solarized' 'solarized'
 skip = [ "$1" = push ]
 
-[/home/urbain/dotfiles/zsh/zgen]
+[$HOME/.zsh/zgen]
 checkout = git clone 'https://github.com/tarjoilija/zgen' 'zgen'
 skip = [ "$1" = push ]
 
-[/home/urbain/dotfiles/urxvt/ext]
+[$HOME/.urxvt/ext]
 checkout = git clone 'https://github.com/muennich/urxvt-perls' 'ext'
 skip = [ "$1" = push ]
diff --git a/msmtprc b/msmtp/.msmtprc
index f056ee7..f056ee7 100644
--- a/msmtprc
+++ b/msmtp/.msmtprc
diff --git a/mutt/.mutt/.gitignore b/mutt/.mutt/.gitignore
new file mode 100644
index 0000000..c3f6190
--- /dev/null
+++ b/mutt/.mutt/.gitignore
@@ -0,0 +1,4 @@
+attachments/*
+cache/*
+solarized
+temp/*
diff --git a/mutt/.mutt/alias b/mutt/.mutt/alias
new file mode 120000
index 0000000..1cc59a8
--- /dev/null
+++ b/mutt/.mutt/alias
@@ -0,0 +1 @@
+../../../personal/mutt/alias
\ No newline at end of file
diff --git a/mutt/colors b/mutt/.mutt/colors
index 39b16b2..39b16b2 100644
--- a/mutt/colors
+++ b/mutt/.mutt/colors
diff --git a/mutt/crypto b/mutt/.mutt/crypto
index 393820b..393820b 100644
--- a/mutt/crypto
+++ b/mutt/.mutt/crypto
diff --git a/mutt/id_personal b/mutt/.mutt/id_personal
index 96892b3..96892b3 100644
--- a/mutt/id_personal
+++ b/mutt/.mutt/id_personal
diff --git a/mutt/id_work b/mutt/.mutt/id_work
index 238cfcb..238cfcb 100644
--- a/mutt/id_work
+++ b/mutt/.mutt/id_work
diff --git a/mutt/mailboxes b/mutt/.mutt/mailboxes
index a4be3a9..a4be3a9 100644
--- a/mutt/mailboxes
+++ b/mutt/.mutt/mailboxes
diff --git a/mutt/mailcap b/mutt/.mutt/mailcap
index dcab31d..dcab31d 100644
--- a/mutt/mailcap
+++ b/mutt/.mutt/mailcap
diff --git a/mutt/muttrc b/mutt/.mutt/muttrc
index 2264a95..2264a95 100644
--- a/mutt/muttrc
+++ b/mutt/.mutt/muttrc
diff --git a/mutt/signature b/mutt/.mutt/signature
index eb52bfb..eb52bfb 100644
--- a/mutt/signature
+++ b/mutt/.mutt/signature
diff --git a/mutt/attachments/.gitkeep b/mutt/attachments/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/mutt/attachments/.gitkeep
+++ /dev/null
diff --git a/mutt/cache/.gitkeep b/mutt/cache/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/mutt/cache/.gitkeep
+++ /dev/null
diff --git a/newsbeuter/cache.db b/newsbeuter/.config/newsbeuter/cache.db
index a92771b..a92771b 100644
--- a/newsbeuter/cache.db
+++ b/newsbeuter/.config/newsbeuter/cache.db
diff --git a/newsbeuter/config b/newsbeuter/.config/newsbeuter/config
index 84a1546..84a1546 100644
--- a/newsbeuter/config
+++ b/newsbeuter/.config/newsbeuter/config
diff --git a/newsbeuter/history.cmdline b/newsbeuter/.config/newsbeuter/history.cmdline
index aed4974..aed4974 100644
--- a/newsbeuter/history.cmdline
+++ b/newsbeuter/.config/newsbeuter/history.cmdline
diff --git a/newsbeuter/history.search b/newsbeuter/.config/newsbeuter/history.search
index e69de29..e69de29 100644
--- a/newsbeuter/history.search
+++ b/newsbeuter/.config/newsbeuter/history.search
diff --git a/newsbeuter/.config/newsbeuter/urls b/newsbeuter/.config/newsbeuter/urls
new file mode 120000
index 0000000..777955c
--- /dev/null
+++ b/newsbeuter/.config/newsbeuter/urls
@@ -0,0 +1 @@
+../../../../personal/newsbeuter/urls
\ No newline at end of file
diff --git a/newsbeuter/urls b/newsbeuter/urls
deleted file mode 120000
index 63047fb..0000000
--- a/newsbeuter/urls
+++ /dev/null
@@ -1 +0,0 @@
-../personal/newsbeuter/urls
\ No newline at end of file
diff --git a/notes b/notes
deleted file mode 120000
index 15654b1..0000000
--- a/notes
+++ /dev/null
@@ -1 +0,0 @@
-personal/notes
\ No newline at end of file
diff --git a/nvim/.config/nvim b/nvim/.config/nvim
new file mode 120000
index 0000000..bf0d817
--- /dev/null
+++ b/nvim/.config/nvim
@@ -0,0 +1 @@
+../../vim/.vim
\ No newline at end of file
diff --git a/qutebrowser/.config/qutebrowser/bookmarks b/qutebrowser/.config/qutebrowser/bookmarks
new file mode 120000
index 0000000..0a2ba12
--- /dev/null
+++ b/qutebrowser/.config/qutebrowser/bookmarks
@@ -0,0 +1 @@
+../../../../personal/qutebrowser/bookmarks
\ No newline at end of file
diff --git a/qutebrowser/keys.conf b/qutebrowser/.config/qutebrowser/keys.conf
index 79a9e13..79a9e13 100644
--- a/qutebrowser/keys.conf
+++ b/qutebrowser/.config/qutebrowser/keys.conf
diff --git a/qutebrowser/.config/qutebrowser/quickmarks b/qutebrowser/.config/qutebrowser/quickmarks
new file mode 120000
index 0000000..b1da307
--- /dev/null
+++ b/qutebrowser/.config/qutebrowser/quickmarks
@@ -0,0 +1 @@
+../../../../personal/qutebrowser/quickmarks
\ No newline at end of file
diff --git a/qutebrowser/qutebrowser.conf b/qutebrowser/.config/qutebrowser/qutebrowser.conf
index 9064d48..9064d48 100644
--- a/qutebrowser/qutebrowser.conf
+++ b/qutebrowser/.config/qutebrowser/qutebrowser.conf
diff --git a/qutebrowser/userscripts/bookmarks-dmenu b/qutebrowser/.local/share/qutebrowser/userscripts/bookmarks-dmenu
index 0f89413..0f89413 100755
--- a/qutebrowser/userscripts/bookmarks-dmenu
+++ b/qutebrowser/.local/share/qutebrowser/userscripts/bookmarks-dmenu
diff --git a/qutebrowser/userscripts/quickmarks-dmenu b/qutebrowser/.local/share/qutebrowser/userscripts/quickmarks-dmenu
index 354b398..354b398 100755
--- a/qutebrowser/userscripts/quickmarks-dmenu
+++ b/qutebrowser/.local/share/qutebrowser/userscripts/quickmarks-dmenu
diff --git a/qutebrowser/userscripts/url-from-surfraw b/qutebrowser/.local/share/qutebrowser/userscripts/url-from-surfraw
index 9bd6795..9bd6795 100755
--- a/qutebrowser/userscripts/url-from-surfraw
+++ b/qutebrowser/.local/share/qutebrowser/userscripts/url-from-surfraw
diff --git a/qutebrowser/bookmarks b/qutebrowser/bookmarks
deleted file mode 120000
index c3dbda6..0000000
--- a/qutebrowser/bookmarks
+++ /dev/null
@@ -1 +0,0 @@
-../personal/qutebrowser/bookmarks
\ No newline at end of file
diff --git a/qutebrowser/quickmarks b/qutebrowser/quickmarks
deleted file mode 120000
index 5313215..0000000
--- a/qutebrowser/quickmarks
+++ /dev/null
@@ -1 +0,0 @@
-../personal/qutebrowser/quickmarks
\ No newline at end of file
diff --git a/surfraw.bookmarks b/surfraw/.surfraw.bookmarks
index c18b3d7..c18b3d7 100644
--- a/surfraw.bookmarks
+++ b/surfraw/.surfraw.bookmarks
diff --git a/tmux.conf b/tmux/.tmux.conf
index bb603a9..bb603a9 100644
--- a/tmux.conf
+++ b/tmux/.tmux.conf
diff --git a/urxvt/.urxvt/ext/resize b/urxvt/.urxvt/ext/resize
new file mode 100644
index 0000000..f3b34fb
--- /dev/null
+++ b/urxvt/.urxvt/ext/resize
@@ -0,0 +1,155 @@
+# vim:ft=perl:fenc=utf-8
+# Copyright (c) 2009-, Simon Lundström <simmel@soy.se>
+# Copyright (c) 2014 Maarten de Vries <maarten@de-vri.es>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+# Usage:
+# Set your font in ~/.Xresources:
+# urxvt.font: xft:Inconsolata:pixelsize=12
+# to set it with pixels or
+# urxvt.font: xft:Inconsolata:size=12
+# to set it with points.
+
+# And re-bind some keymappings (if you want, below are the defaults):
+# URxvt.resize-font.smaller: C-minus
+# URxvt.resize-font.bigger: C-plus
+# URxvt.resize-font.reset: C-equal
+# URxvt.resize-font.show: C-question
+#
+
+my @fonts = (
+  {'name' => 'font',           'code' => 710},
+  {'name' => 'boldFont',       'code' => 711},
+  {'name' => 'italicFont',     'code' => 712},
+  {'name' => 'boldItalicFont', 'code' => 713},
+);
+
+my @fixed = qw(4x6 5x7 5x8 6x9 6x10 6x12 6x13 7x13 7x14 8x13 8x16 9x15 9x18 10x20 12x24);
+
+sub on_start {
+  my ($self) = @_;
+
+  foreach (@fonts) {
+    $_->{'default'} = $self->resource($_->{'name'});
+  }
+}
+
+sub on_init {
+   my ($self) = @_;
+   my $commands = {
+     "smaller" => "C-minus",
+     "bigger"  => "C-plus",
+     "reset"   => "C-equal",
+     "show"    => "C-question",
+   };
+   bind_hotkeys($self, $commands);
+
+   ()
+}
+
+sub bind_hotkeys {
+  my ($self, $commands) = @_;
+  for (keys %$commands) {
+    my $hotkey = $self->x_resource("resize-font.$_") || $$commands{$_};
+
+    $self->parse_keysym($hotkey, "perl:resize-font:$_") or
+    warn "unable to register '$hotkey' as hotkey for $_\n";
+  }
+}
+
+sub on_user_command {
+  my ($self, $string) = @_;
+  my $regex = qr"(?!pixelsize=)(\d+)";
+
+  if ($string =~ /bigger$/) {
+    foreach (@fonts) {
+      next if not defined($_->{'default'});
+      update_font_size($self, $_, +2);
+    }
+  }
+  elsif ($string =~ /smaller$/) {
+    foreach (@fonts) {
+      next if not defined($_->{'default'});
+      update_font_size($self, $_, -2);
+    }
+  }
+  elsif ($string =~ /reset$/) {
+    foreach (@fonts) {
+      next if not defined($_->{'default'});
+      set_font($self, $_, $_->{'default'});
+    }
+  }
+  elsif ($string =~ /show$/) {
+
+    my $term = $self->{'term'};
+    $term->{'resize-font'}{'overlay'} = {
+      ov => $term->overlay_simple(0, -1, format_font_info($self)),
+      to => urxvt::timer
+      ->new
+      ->start(urxvt::NOW + 1)
+      ->cb(sub {
+        delete $term->{'resize-font'}{'overlay'};
+      }),
+    };
+  }
+
+  ()
+}
+
+sub get_font {
+  my ($self, $name) = @_;
+  return $self->resource($name);
+}
+
+sub set_font {
+  my ($self, $font, $new) = @_;
+  $self->cmd_parse(sprintf("\33]%d;%s\007", $font->{'code'}, $new));
+}
+
+sub update_font_size {
+  my ($self, $font, $delta) = @_;
+  my $regex = qr"(?<=size=)(\d+)";
+  my $current = get_font($self, $font->{'name'});
+
+  my ($index) = grep { $fixed[$_] eq $current } 0..$#fixed;
+  if ($index or $index eq 0) {
+    my $inc = $delta / abs($delta);
+    $index += $inc;
+    if ($index < 0) { $index = 0; }
+    if ($index > $#fixed) { $index = $#fixed; }
+    $current = $fixed[$index];
+  }
+  else {
+    $current =~ s/$regex/$1+$delta/e;
+  }
+  set_font($self, $font, $current);
+}
+
+sub format_font_info {
+  my ($self) = @_;
+
+  my $width = 0;
+  foreach (@fonts) {
+    my $length = length($_->{'name'});
+    $width = $length > $width ? $length : $width;
+  }
+  ++$width;
+
+  my $info = '';
+  foreach (@fonts) {
+    $info .= sprintf("%-${width}s %s\n", $_->{'name'} . ':', get_font($self, $_->{'name'}));
+  }
+
+  return $info;
+}
diff --git a/vifm/.vifm/.gitignore b/vifm/.vifm/.gitignore
new file mode 100644
index 0000000..8c6b1ef
--- /dev/null
+++ b/vifm/.vifm/.gitignore
@@ -0,0 +1,3 @@
+Trash
+vifminfo*
+vimfiles
diff --git a/vifm/colors/default.vifm b/vifm/.vifm/colors/default.vifm
index c3c72dd..c3c72dd 100644
--- a/vifm/colors/default.vifm
+++ b/vifm/.vifm/colors/default.vifm
diff --git a/vifm/colors/matrix.vifm b/vifm/.vifm/colors/matrix.vifm
index 70a9f76..70a9f76 100644
--- a/vifm/colors/matrix.vifm
+++ b/vifm/.vifm/colors/matrix.vifm
diff --git a/vifm/colors/solarized.vifm b/vifm/.vifm/colors/solarized.vifm
index a792bd9..a792bd9 100644
--- a/vifm/colors/solarized.vifm
+++ b/vifm/.vifm/colors/solarized.vifm
diff --git a/vifm/colorschemes b/vifm/.vifm/colorschemes
index 006bb44..006bb44 100644
--- a/vifm/colorschemes
+++ b/vifm/.vifm/colorschemes
diff --git a/vifm/scripts/README b/vifm/.vifm/scripts/README
index 8165c2f..8165c2f 100644
--- a/vifm/scripts/README
+++ b/vifm/.vifm/scripts/README
diff --git a/vifm/vifm-help.txt b/vifm/.vifm/vifm-help.txt
index 2b6bbba..2b6bbba 100644
--- a/vifm/vifm-help.txt
+++ b/vifm/.vifm/vifm-help.txt
diff --git a/vifm/vifmrc b/vifm/.vifm/vifmrc
index 8a301db..8a301db 100644
--- a/vifm/vifmrc
+++ b/vifm/.vifm/vifmrc
diff --git a/vim/.config/nvim b/vim/.config/nvim
new file mode 120000
index 0000000..815cbcc
--- /dev/null
+++ b/vim/.config/nvim
@@ -0,0 +1 @@
+../.vim
\ No newline at end of file
diff --git a/vim/.init.vim-rplugin~ b/vim/.init.vim-rplugin~
deleted file mode 100644
index 98ed46e..0000000
--- a/vim/.init.vim-rplugin~
+++ /dev/null
@@ -1,9 +0,0 @@
-" python3 plugins
-call remote#host#RegisterPlugin('python3', '/home/urbain/.vim/plugged/deoplete.nvim/rplugin/python3/deoplete.py', [
-      \ {'sync': 1, 'name': '_deoplete', 'opts': {}, 'type': 'function'},
-     \ ])
-
-
-" python plugins
-
-
diff --git a/vim/.vim/.gitignore b/vim/.vim/.gitignore
new file mode 100644
index 0000000..ea8b046
--- /dev/null
+++ b/vim/.vim/.gitignore
@@ -0,0 +1,4 @@
+.netrwhist
+plugged
+vim-plug
+vimundo/*
diff --git a/vim/.vim/.init.vim-rplugin~ b/vim/.vim/.init.vim-rplugin~
new file mode 100644
index 0000000..e1137d2
--- /dev/null
+++ b/vim/.vim/.init.vim-rplugin~
@@ -0,0 +1,12 @@
+" python3 plugins
+call remote#host#RegisterPlugin('python3', '/home/urbain/.vim/plugged/deoplete.nvim/rplugin/python3/deoplete', [
+      \ {'sync': 1, 'name': '_deoplete', 'type': 'function', 'opts': {}},
+     \ ])
+
+
+" ruby plugins
+
+
+" python plugins
+
+
diff --git a/vim/after/ftplugin/freefem/folding.vim b/vim/.vim/after/ftplugin/freefem/folding.vim
index 7d2f6fd..7d2f6fd 100644
--- a/vim/after/ftplugin/freefem/folding.vim
+++ b/vim/.vim/after/ftplugin/freefem/folding.vim
diff --git a/vim/after/ftplugin/tex/mappings.vim b/vim/.vim/after/ftplugin/tex/mappings.vim
index 1c4625d..1c4625d 100644
--- a/vim/after/ftplugin/tex/mappings.vim
+++ b/vim/.vim/after/ftplugin/tex/mappings.vim
diff --git a/vim/after/ftplugin/tex/unilatex.vim b/vim/.vim/after/ftplugin/tex/unilatex.vim
index 69358fc..69358fc 100644
--- a/vim/after/ftplugin/tex/unilatex.vim
+++ b/vim/.vim/after/ftplugin/tex/unilatex.vim
diff --git a/vim/after/ftplugin/vim/folding.vim b/vim/.vim/after/ftplugin/vim/folding.vim
index 1454cbe..1454cbe 100644
--- a/vim/after/ftplugin/vim/folding.vim
+++ b/vim/.vim/after/ftplugin/vim/folding.vim
diff --git a/vim/autoload/plug.vim b/vim/.vim/autoload/plug.vim
index 6c4bafe..6c4bafe 120000
--- a/vim/autoload/plug.vim
+++ b/vim/.vim/autoload/plug.vim
diff --git a/vim/colors/mine.vim b/vim/.vim/colors/mine.vim
index 25d8a97..25d8a97 100644
--- a/vim/colors/mine.vim
+++ b/vim/.vim/colors/mine.vim
diff --git a/vim/.vim/init.vim b/vim/.vim/init.vim
new file mode 120000
index 0000000..f67022e
--- /dev/null
+++ b/vim/.vim/init.vim
@@ -0,0 +1 @@
+../.vimrc
\ No newline at end of file
diff --git a/vim/.vim/mySnippets b/vim/.vim/mySnippets
new file mode 120000
index 0000000..ad5268e
--- /dev/null
+++ b/vim/.vim/mySnippets
@@ -0,0 +1 @@
+../../../personal/vim/mySnippets
\ No newline at end of file
diff --git a/vim/vimrc b/vim/.vimrc
index c91a1ac..0132d45 100644
--- a/vim/vimrc
+++ b/vim/.vimrc
@@ -17,6 +17,7 @@ let g:localvimrc_sandbox = 0
 Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
 Plug 'jamessan/vim-gnupg'
+Plug 'junegunn/goyo.vim'
 Plug 'junegunn/fzf.vim'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 let g:fzf_buffers_jump = 1
@@ -43,6 +44,8 @@ Plug 'junegunn/seoul256.vim'
 Plug 'junegunn/vim-easy-align'
 xmap ga <Plug>(EasyAlign)
 nmap ga <Plug>(EasyAlign)
+xmap gl <Plug>(LiveEasyAlign)
+nmap gl <Plug>(LiveEasyAlign)
 
 Plug 'junegunn/vim-peekaboo'
 Plug 'junegunn/vim-pseudocl'
@@ -273,7 +276,6 @@ nnoremap Q :bd!<cr>
 nnoremap <Leader>w :w<cr>
 nnoremap <Leader>q :q!<cr>
 nnoremap <LocalLeader>h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp,<CR>
-nnoremap gm :Make<cr>
 nnoremap J mzJ`z
 nnoremap Y y$
 nnoremap + za
diff --git a/vim/init.vim b/vim/init.vim
deleted file mode 120000
index c9a3c9c..0000000
--- a/vim/init.vim
+++ /dev/null
@@ -1 +0,0 @@
-vimrc
\ No newline at end of file
diff --git a/vim/mySnippets b/vim/mySnippets
deleted file mode 120000
index ccab7d4..0000000
--- a/vim/mySnippets
+++ /dev/null
@@ -1 +0,0 @@
-../personal/vim/mySnippets
\ No newline at end of file
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
deleted file mode 100644
index 460c1ea..0000000
--- a/vim/spell/en.utf-8.add
+++ /dev/null
@@ -1,28 +0,0 @@
-Plugin
-Colorscheme
-vim
-multiscale
-SDEs
-SPDEs
-Abdulle
-Pavliotis
-Ornstein
-Uhlenbeck
-MRes
-Galerkin
-ODEs
-PDEs
-Kolmogorov
-SDE
-Maruyama
-advective
-eqref
-Milgram
-Cea's
-Lyapunov
-Gnuplot
-Cholesky
-Assyr
-EPFL
-SymPy
-CMake
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
deleted file mode 100644
index a300e1e..0000000
--- a/vim/spell/en.utf-8.add.spl
+++ /dev/null
diff --git a/vim/spell/en.utf-8.spl b/vim/spell/en.utf-8.spl
deleted file mode 100644
index a41bf79..0000000
--- a/vim/spell/en.utf-8.spl
+++ /dev/null
diff --git a/vim/spell/en.utf-8.sug b/vim/spell/en.utf-8.sug
deleted file mode 100644
index b82667d..0000000
--- a/vim/spell/en.utf-8.sug
+++ /dev/null
diff --git a/vim/vimundo/.gitkeep b/vim/vimundo/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/vim/vimundo/.gitkeep
+++ /dev/null
diff --git a/vimperatorrc b/vimperator/.vimperatorrc
index f3168e3..1944fc6 100644
--- a/vimperatorrc
+++ b/vimperator/.vimperatorrc
@@ -1,2 +1,2 @@
 highlight Hint font-size:100%;color:black;background-color:yellow;padding:2px;text-transform:uppercase;
-set hintchars=uhetonasid.c,rpg
+set hintchars=uhetonasidcrpg
diff --git a/xinitrc b/xinit/.xinitrc
index 9118272..9118272 100755
--- a/xinitrc
+++ b/xinit/.xinitrc
diff --git a/zathurarc b/zathura/.config/zathura/zathurarc
index 543633d..543633d 100644
--- a/zathurarc
+++ b/zathura/.config/zathura/zathurarc
diff --git a/zsh/.zsh/.gitignore b/zsh/.zsh/.gitignore
new file mode 100644
index 0000000..8ca273a
--- /dev/null
+++ b/zsh/.zsh/.gitignore
@@ -0,0 +1,2 @@
+tmp
+zgen
diff --git a/zsh/alias b/zsh/.zsh/alias
index 7da7fb5..7da7fb5 100644
--- a/zsh/alias
+++ b/zsh/.zsh/alias
diff --git a/zsh/functions b/zsh/.zsh/functions
index 7c2b49a..7c2b49a 100644
--- a/zsh/functions
+++ b/zsh/.zsh/functions
diff --git a/zsh/plugins b/zsh/.zsh/plugins
index 43b2916..1016b88 100644
--- a/zsh/plugins
+++ b/zsh/.zsh/plugins
@@ -1,7 +1,7 @@
 #! /bin/zsh
 
 # Load zgen
-source "$HOME/.zgen/zgen.zsh"
+source "$HOME/.zsh/zgen/zgen.zsh"
 
 # Load plugins
 if ! zgen saved; then
diff --git a/zsh/zshrc b/zsh/.zshrc
index fe44e9e..fe44e9e 100644
--- a/zsh/zshrc
+++ b/zsh/.zshrc