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

Conflicts:
	passwords/main.asc
	repos.zsh
	vim/.netrwhist
	xmodmap

1 files changed, 9 insertions, 5 deletions

diff --git a/repos.zsh b/repos.zsh
index 4a0a2fa..888682f 100644
--- a/repos.zsh
+++ b/repos.zsh
@@ -1,15 +1,14 @@
-declare -A repodirs install
+declare -A repodirs install uninstall
 
 # General purpose
 repodirs[icholy/ttygif]=/home/urbain/github/ttygif
-repodirs[alols/xcape]=/home/urbain/xcape
 
 # Solarized
 repodirs[altercation/mutt-colors-solarized]=/home/urbain/github/mutt-colors-solarized
 
 # My plugins
 repodirs[uvaes/fzf-marks]=/home/urbain/github/fzf-marks
-repodirs[uvaes/grm]=/home/urbain/.grm
+repodirs[uvaes/grm]=/home/urbain/github/grm
 
 # fzf-related
 repodirs[junegunn/fzf]=/home/urbain/.fzf
@@ -21,6 +20,11 @@ repodirs[tmux-plugins/tpm]=/home/urbain/.tmux/plugins/tpm
 repodirs[tarjoilija/zgen]=/home/urbain/.zgen
 
 # Experimental
+repodirs[adbrebs/taxi]=/home/urbain/github/adbrebs/taxi
+repodirs[adbrebs/meg]=/home/urbain/github/adbrebs/meg
+repodirs[adbrebs/brain_segmentation]=/home/urbain/github/adbrebs/brain_segmentation
+
+# Experimental
 repodirs[adbrebs/taxi]=/home/urbain/github/taxi
 
 # Installation
@@ -32,10 +36,10 @@ function after_vimplug {
     ln -s ../vim-plug/plug.vim;
 }
 
-install[alols/xcape]='make'
+# Installation instructions
 install[icholy/ttygif]='make'
 install[junegunn/fzf]='./install'
 install[junegunn/vim-plug]='after_vimplug'
 
-# Uninstallation
+# Uninstall
 uninstall[junegunn/fzf]='./uninstall'