summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <root@pigstarter.de>2014-02-28 01:59:01 +0100
committermakefu <root@pigstarter.de>2014-02-28 01:59:01 +0100
commit887d83578e342a12e5bfdba1436bba11ad837ab0 (patch)
tree7ab22ed58dccf8bb4e6f876ed648ebdffc2097e3
parent6e695c97ccdf3615e3acd3a022b9664d2a20c2eb (diff)
parentb201fb5074cb38ce713fce42b97cf6e23b5c7e79 (diff)
Merge branch 'master' of https://github.com/krebscode/painload
-rwxr-xr-xship/src/bootstrap_env_makefu51
1 files changed, 6 insertions, 45 deletions
diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu
index 7ec59a79..44148665 100755
--- a/ship/src/bootstrap_env_makefu
+++ b/ship/src/bootstrap_env_makefu
@@ -4,6 +4,9 @@
#@strict
#@include core
#@include punani
+#@include vim
+#@mainifyme
+
info "Configuring environment for $(id -un)"
cd $(readlink -f $(dirname $0))
info "Using punani to install git vim and zsh"
@@ -68,43 +71,22 @@ mkdir -p $HOME/.vim
# TODO modilarize vimconfig
cat > $HOME/.vim/vimrc <<EOF
-set nocompatible
filetype off
set rtp+=~/.vim/bundle/vundle
call vundle#rc()
-
" TODO refactor this
Bundle 'gmarik/vundle'
Bundle 'SudoEdit.vim'
Bundle 'snipMate'
Bundle 'tpope/vim-fugitive'
-Bundle 'vim-scripts-iptables'
-Bundle 'pyflakes'
+Bundle 'Valloric/YouCompleteMe'
+Bundle 'scrooloose/syntastic'
filetype plugin indent on
-syntax on
-set vb
let g:snips_author = 'Bob Ross <root@syntax-fehler.de>'
let g:makefu_author = 'makefu'
-set foldenable
-set foldmethod=syntax
-" shows matching braches etc
-set showmatch
-set matchtime=3
-" highlight search
-set hlsearch
-
-" set noswapfile
-" set nobackup
-set backupdir=~/.vim/backup
-set directory=~/.vim/backup
-
-" turn off F1
-inoremap <F1> <ESC>
-nnoremap <F1> <ESC>
-vnoremap <F1> <ESC>
" pasting
nnoremap <F2> :set invpaste paste?<CR>
set pastetoggle=<F2>
@@ -114,34 +96,13 @@ set showmode
au FocusLost * :wa
set spelllang=en
-" use set spell to enable spelling
-
-" press ttt to rot16 the whole file
-nmap ttt ggg?G
-
-colorscheme darkblue
-set background=dark
-set number
-set mouse=
set textwidth=9001
-set ignorecase
-set incsearch
-set wildignore=*.o,*.obj,*.bak,*.exe,*.os
-
-set shiftwidth=2
-set tabstop=2
-set et
-set sw=2
-set smarttab
-set autoindent
-" end tabstop
-set backspace=indent,eol,start
-set nocp
autocmd BufRead *.json set filetype=json
EOF
ln -vs $HOME/.vim/vimrc $HOME/.vimrc
+vim_conf_sane_defaults
#install all the vim stuff with the help of vundle
cd $HOME/.vim