geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Thingies

Browse source
This commit is contained in:
Geoffrey Frogeye 2017-02-12 08:46:54 +01:00
parent d24a04cc3a
commit 0120c00ff3
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/installPreferences.sh
View file

@ -189,14 +189,14 @@ function install-preferences {
else else
inst make inst make
fi fi
inst git cmake clang llvm inst git
# Text editor # Text editor
if [ $TERMUX == 1 ]; then if [ $TERMUX == 1 ]; then
inst vim-python inst vim-python
elif [ $DEBIAN == 1 ]; then elif [ $DEBIAN == 1 ]; then
inst vim-youcompleteme inst vim-nox
ln -s $DEBLOC_ROOT/usr/bin/vim{.nox,} ln -s $DEBLOC_ROOT/usr/bin/vim{.nox,}
else else
inst vim inst vim
@ -210,16 +210,17 @@ function install-preferences {
vim +PluginInstall +qall vim +PluginInstall +qall
# YouCompleteMe (vim plugin) # YouCompleteMe (vim plugin)
if [ $DEBIAN != 1 ]; then if [[ $DEBIAN == 1 || $TERMUX == 1 ]]; then
if [ $DEBIAN == 1 || $TERMUX == 1 ]; then inst python-dev python3-dev libxml2-dev libxslt-dev
inst python-dev python3-dev
fi fi
local YCM_ARGS="" local YCM_ARGS=""
if [ $TERMUX == 0 ]; then if [ $TERMUX != 1 ]; then
YCM_ARGS="$YCM_ARGS --clang-completer --tern-completer" YCM_ARGS="$YCM_ARGS --clang-completer --tern-completer"
fi fi
python $HOME/.vim/bundle/YouCompleteMe/install.py $YCM_ARGS 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 fi
python $HOME/.vim/bundle/YouCompleteMe/install.py $YCM_ARGS
# Common GUI # Common GUI
@ -259,6 +260,9 @@ function install-preferences {
fi fi
if [ $EXTRA == 1 ]; then if [ $EXTRA == 1 ]; then
# Extra dev
inst cmake clang llvm
# Extra CLI # Extra CLI
inst sl ffmpeg youtube-dl inst sl ffmpeg youtube-dl

2
vimrc
View file

@ -33,7 +33,7 @@ Plugin 'majutsushi/tagbar'
Plugin 'wellle/targets.vim' Plugin 'wellle/targets.vim'
Plugin 'Chiel92/vim-autoformat' Plugin 'Chiel92/vim-autoformat'
Plugin 'Valloric/YouCompleteMe' Plugin 'Valloric/YouCompleteMe'
Plugin 'Raimondi/delimitMate' "Plugin 'Raimondi/delimitMate'
call vundle#end() " required call vundle#end() " required
filetype plugin indent on " required filetype plugin indent on " required