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

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

6 files changed, 27 insertions, 26 deletions

diff --git a/README.md b/README.md
index 1245e3c..36344da 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,3 @@ This repository contains my configuration files. I use the following programs:
 + *zathura* to view pdf files.
 + *offlineimap* + *mutt* + *msmtp* to receive, wirte, and send emails.
 + *zsh* with the *oh-my-zsh* framework as my shell. 
-
-All the configuration files can be installed by executing the script install.sh, which can be used to 
-
-- Install, update, and clean git repositories. Thanks to a parallel implementation inspired from [vim-plug](https://github.com/junegunn/vim-plug), this is done efficiently by the script.
-- Install copies (symbolic links) of the configuration files in my home directory.
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 1594783..b8ff442 100644
--- a/passwords/main.asc
+++ b/passwords/main.asc
@@ -1,6 +1,7 @@
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v1
 
+<<<<<<< HEAD
 hQIMA2AwAsuYqCfXAQ//Rh9CxPBXFCTJWb50Leo+ajlLyNp24f18iKgHajWCWl+L
 LnHZULza+gGDCZ0nCx5j0R8KLLmzBm7OtHQeinGt6GA5hn6eswjHUhRK5JJmmaU/
 0YICerPyxAMwb/ilseH9dzyJEWsfh37vK8+ErxlsaOSDseWTGpI9rSAo2jUucx3C
@@ -15,4 +16,20 @@ x+42TjozDOkOsyikW+wVCWl6K32SgVREXeBhG1t9Z1QQCdHKWNi/oc5lreisX+co
 SwFdNekRg7yThIt1NpeYZO5CYbxF6dPE4bK7Xk3mBnlK1mfN13DiGZQLQBcbdLhE
 NsllvDHSGxV6JZ5SQWlX2tV7jdnt2mzsGV0OTQ==
 =wQzI
+=======
+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
+>>>>>>> 198ed10e9c4c725808e68aeb6885446d6d586f24
 -----END PGP MESSAGE-----
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'
diff --git a/vim/.netrwhist b/vim/.netrwhist
deleted file mode 100644
index a536ddd..0000000
--- a/vim/.netrwhist
+++ /dev/null
@@ -1,8 +0,0 @@
-let g:netrw_dirhistmax  =10
-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/zshrc b/zshrc
index b5e1afc..eb2b91c 100644
--- a/zshrc
+++ b/zshrc
@@ -20,8 +20,6 @@ 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