Add various small changes

7 files changed, 39 insertions, 37 deletions

diff --git a/install.sh b/install.sh
index 0ae7862..2b64f5e 100755
--- a/install.sh
+++ b/install.sh
@@ -38,13 +38,8 @@ function clean {
 }
 
 function install_packages {
-
-    # General
     sudo apt-get install ttyrec mutt msmtp offlineimap wmctrl rxvt-unicode-256color \
-        tmux git gcc clang cmake make zathura feh chromium-browser zsh
-
-    # For xcape
-    sudo apt-get install pkg-config libx11-dev libxtst-dev libxi-dev clang
+        tmux git gcc clang cmake make zathura feh chromium-browser zsh clang xcape
 }
 
 function update_dotfiles {
diff --git a/passwords/main.asc b/passwords/main.asc
index a31d6c3..342ca7a 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
+hQIMA2AwAsuYqCfXARAAlhm8lNd42G6z48Ox7gGPkbEaLhN5ujX7mjZfsI5nwoQw
+pASBnrOdhQQPPu0QLTmCmnHNIsTc8lcH4WJ00d7txyRZRFdxVdKtb2qLSyHgleEG
+7xDy3svWRRHaRmPpzCBPvQ/zmD728ZFELcgrY5/VdG4XMQ7XQLt4fCFM825L4htv
+3ReCW9s5Ex6ifviAhKIJABCwN2P0O7iKgUHn4Nclfdxq+K79ztoJBvAFLwslk9la
+MawPpbEORx9Y1GnZJZp1Cz6ZAWuwGbV5e31+twsbOOMHTR/UflxOCZVqvXr+KwCW
+QeEdYgOmFj4A4YQAB0zHl7Pok5A7zUgI1Su+lJcHK7vVr5ZdaHR0w+qTBt72h5G+
++buySGN0b0zypyS4AkQB8CfVcl8JMZJuTH3NervvY16hvZ/spWkVpwszjhgivVkL
+9NzhcrUofnnxI10AoyTbb7sKgcwnxufgamoCOEdDZwGxANx1DxDw7UMPNOgB9D7/
+6acqBgopqhjDfuNoV4BSFuK0xjhtQ/+MHW0ri82htGirQAToz1uy2k7K0rah5R3R
+4jUe3AWB3VCdFDpjlCdLWWpw0pv2Nfr0f/89HsWaLf9DDwk5HzeCiEO9a3gPMcff
+A7TbTX1P8/XEQQRSKoZ0FK4hLa1xVJMXedC+yUsc1v9O/brpnoocCgUIuyptZ5LS
+SwEZdECMFBCaJfVL6a7oKFkKE6JyHGguwdRbp9WQY1M1eSr2X1cKmayMHs4ZpQxN
+WRPiMvRU3SmTH8OfTtJ3ge6bAdfZ4RpNMu6bQg==
+=TddI
 -----END PGP MESSAGE-----
diff --git a/repos.zsh b/repos.zsh
index 2d0326f..5555d94 100644
--- a/repos.zsh
+++ b/repos.zsh
@@ -1,16 +1,16 @@
 declare -A repodirs
-declare -A actions
+declare -A install
+declare -A 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
@@ -19,7 +19,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/adbrebs/taxi
+repodirs[adbrebs/meg]=/home/urbain/github/adbrebs/meg
+repodirs[adbrebs/brain_segmentation]=/home/urbain/github/adbrebs/brain_segmentation
 
 function after_vimplug {
     cd ..
@@ -29,8 +34,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'
+# Installation instructions
+install[icholy/ttygif]='make'
+install[junegunn/fzf]='./install'
+install[junegunn/vim-plug]='after_vimplug'
+
+# Uninstall
+uninstall[junegunn/fzf]='./uninstall'
diff --git a/vim/.netrwhist b/vim/.netrwhist
index 637791c..2e6d4cf 100644
--- a/vim/.netrwhist
+++ b/vim/.netrwhist
@@ -1,5 +1,7 @@
 let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =3
+let g:netrw_dirhist_cnt =5
 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'
diff --git a/vimrc b/vimrc
index f1304d9..663cb86 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'
diff --git a/xmodmap b/xmodmap
index 86d827f..6b7bbb7 100755
--- a/xmodmap
+++ b/xmodmap
@@ -29,5 +29,5 @@ 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'
diff --git a/zshrc b/zshrc
index 4e3c2ce..014150d 100644
--- a/zshrc
+++ b/zshrc
@@ -1,4 +1,4 @@
-Load zgen
+# Load zgen
 source "/home/urbain/.zgen/zgen.zsh"
 
 if ! zgen saved; then
@@ -20,13 +20,11 @@ if ! zgen saved; then
     zgen load zsh-users/zsh-syntax-highlighting
 
     # Appearance
-    # zgen load mafredri/zsh-async
-    # zgen load sindresorhus/pure
     zgen oh-my-zsh themes/eastwood
 
     # My plugins
     zgen load uvaes/fzf-marks
-    # zgen load uvaes/grm
+    zgen load uvaes/grm
 
     # Other plugins
     zgen load rupa/z