diff options
| author | makefu <github@syntax-fehler.de> | 2014-03-07 15:51:36 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2014-03-07 15:51:36 +0100 |
| commit | d090f6563fd45a0fcae59cf7fc5730e257facc8c (patch) | |
| tree | b86a77df748fd2431c74812cca6b5b33f43baaa0 /ship | |
| parent | f91c15a6ac8e94dae54f4cdaa93defd3f7006226 (diff) | |
| parent | c48ee1d169a77902442639f6bc48d0a7b291eafb (diff) | |
Merge branch 'master' of ssh://github.com/krebscode/painload
Diffstat (limited to 'ship')
| -rw-r--r-- | ship/lib/_punani_db | 1 | ||||
| -rw-r--r-- | ship/lib/vim | 1 | ||||
| -rwxr-xr-x | ship/src/bootstrap_env_makefu | 27 |
3 files changed, 25 insertions, 4 deletions
diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db index 609baf07..e5bf15b1 100644 --- a/ship/lib/_punani_db +++ b/ship/lib/_punani_db @@ -54,3 +54,4 @@ _punanidb_aptget_nano=nano _punanidb_pacman_vim=vim _punanidb_yum_vim=vim-enhanced _punanidb_aptget_vim=vim + diff --git a/ship/lib/vim b/ship/lib/vim index 43173585..f75f3d0e 100644 --- a/ship/lib/vim +++ b/ship/lib/vim @@ -22,6 +22,7 @@ inoremap <F1> <ESC> nnoremap <F1> <ESC> vnoremap <F1> <ESC> set wildignore=*.o,*.obj,*.bak,*.exe,*.os +cmap w!! w !sudo tee > /dev/null % colorscheme darkblue set background=dark set number diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 44148665..6c75cd57 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -5,12 +5,23 @@ #@include core #@include punani #@include vim + +# vim +python +_punanidb_pacman_vim_python=gvim +_punanidb_yum_vim_python=vim-enhanced +_punanidb_aptget_vim_python=vim + +# TODO pull out youcompleteme into a vim function +# cmake ,make,g++,python-dev for youcompleteme +_punanidb_pacman_cmake=cmake +_punanidb_yum_cmake=cmake +_punanidb_aptget_cmake=cmake #@mainifyme info "Configuring environment for $(id -un)" cd $(readlink -f $(dirname $0)) info "Using punani to install git vim and zsh" -punani install git vim zsh || error "cannot install some shit" +punani install git vim_python zsh gpp cmake make python2_dev || die "cannot install some shit" info "writing dotfiles" # deploying zshrc @@ -100,19 +111,27 @@ set spelllang=en set textwidth=9001 autocmd BufRead *.json set filetype=json EOF - +if [ -e $HOME/.vimrc ] ; then + oldvim=$HOME/.vimrc.`date +%Y%M%d` + info "Backing up old vimrc file to $oldvim" + mv -v $HOME/.vimrc $oldvim +fi +info "Symlinking .vimrc to .vim/vimrc" ln -vs $HOME/.vim/vimrc $HOME/.vimrc vim_conf_sane_defaults #install all the vim stuff with the help of vundle cd $HOME/.vim -mkdir bundle -mkdir backup +mkdir -p bundle info "Fetching vim-vundle" git clone https://github.com/gmarik/vundle.git bundle/vundle > /dev/null && \ info "Vim Vundle deployed" info "Installing Vundle Bundles" vim "+:BundleInstall" "+:qall" + +info "building youcompleteme libs" +cd $HOME/.vim/bundle/YouCompleteMe +./install.sh cd - info "configuring zsh" |