Merge branch 'master' of frogit:geoffrey/dotfiles

Conflicts:
	vimrc

scripts/installPreferences.sh

@@ -194,14 +194,14 @@ function install-preferences {
     else
         inst make
     fi
-    inst git cmake clang llvm
+    inst git
 
 
     # Text editor
     if [ $TERMUX == 1 ]; then
         inst vim-python
     elif [ $DEBIAN == 1 ]; then
-        inst vim-youcompleteme
+        inst vim-nox
         ln -s $DEBLOC_ROOT/usr/bin/vim{.nox,}
     else
         inst vim
@@ -215,16 +215,17 @@ function install-preferences {
     vim +PluginInstall +qall
 
     # YouCompleteMe (vim plugin)
-    if [ $DEBIAN != 1 ]; then
-        if [ $DEBIAN == 1 || $TERMUX == 1 ]; then
-            inst python-dev python3-dev
-        fi
-        local YCM_ARGS=""
-        if [ $TERMUX == 0 ]; then
-            YCM_ARGS="$YCM_ARGS --clang-completer --tern-completer"
-        fi
-        python $HOME/.vim/bundle/YouCompleteMe/install.py $YCM_ARGS
+    if [[ $DEBIAN == 1 || $TERMUX == 1 ]]; then
+        inst python-dev python3-dev libxml2-dev libxslt-dev
     fi
+    local YCM_ARGS=""
+    if [ $TERMUX != 1 ]; then
+        YCM_ARGS="$YCM_ARGS --clang-completer --tern-completer"
+    fi
+    if [[ $DEBIAN == 1 && $ADMIN == 0 ]]; then
+        export CPLUS_INCLUDE_PATH="$DEBLOC_ROOT/usr/include/python2.7/:$DEBLOC_ROOT/usr/include/x86_64-linux-gnu/python2.7/:$CPLUS_INCLUDE_PATH"
+    fi
+    python $HOME/.vim/bundle/YouCompleteMe/install.py $YCM_ARGS
 
     # Common GUI
 
@@ -273,6 +274,9 @@ function install-preferences {
     fi
 
     if [ $EXTRA == 1 ]; then
+        # Extra dev
+        inst cmake clang llvm
+
         # Extra CLI
         inst sl ffmpeg youtube-dl