|
|
@ -35,6 +35,7 @@ endif |
|
|
|
set tabstop=4 " tabs are displayed as 4 spaces |
|
|
|
set tabstop=4 " tabs are displayed as 4 spaces |
|
|
|
set shiftwidth=4 " by default, when auto-identing, add 4 spaces (or 1 tabstop) |
|
|
|
set shiftwidth=4 " by default, when auto-identing, add 4 spaces (or 1 tabstop) |
|
|
|
set foldmethod=marker " fold on markers |
|
|
|
set foldmethod=marker " fold on markers |
|
|
|
|
|
|
|
set foldlevel=3 " number of folds to open automatically |
|
|
|
set scrolloff=1 " always show one line around the cursor |
|
|
|
set scrolloff=1 " always show one line around the cursor |
|
|
|
set laststatus=2 " always show the status bar ('cause I like to see the line and column, always) |
|
|
|
set laststatus=2 " always show the status bar ('cause I like to see the line and column, always) |
|
|
|
set showtabline=2 " always show the tabline |
|
|
|
set showtabline=2 " always show the tabline |
|
|
@ -107,7 +108,7 @@ if has("autocmd") |
|
|
|
" (use spaces instead of tabs (expandtab), uses 4 spaces for tabs (tabstop), |
|
|
|
" (use spaces instead of tabs (expandtab), uses 4 spaces for tabs (tabstop), |
|
|
|
" when auto-indenting, also use 4 spaces (shiftwidth), when deleting text, 4 |
|
|
|
" when auto-indenting, also use 4 spaces (shiftwidth), when deleting text, 4 |
|
|
|
" spaces are a tab (softtabstop) and break the line at column 78 (textwidth)) |
|
|
|
" spaces are a tab (softtabstop) and break the line at column 78 (textwidth)) |
|
|
|
au FileType python setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 textwidth=78 |
|
|
|
au FileType python setlocal expandtab tabstop=4 shiftwidth=4 softtabstop=4 textwidth=78 colorcolumn=79 |
|
|
|
|
|
|
|
|
|
|
|
" reStructured files follow python closely, but use 3 tab stops instead of 4 |
|
|
|
" reStructured files follow python closely, but use 3 tab stops instead of 4 |
|
|
|
au FileType rst setlocal expandtab tabstop=3 sw=3 sts=3 textwidth=78 |
|
|
|
au FileType rst setlocal expandtab tabstop=3 sw=3 sts=3 textwidth=78 |
|
|
@ -219,14 +220,14 @@ Bundle 'jiangmiao/auto-pairs' |
|
|
|
|
|
|
|
|
|
|
|
" python |
|
|
|
" python |
|
|
|
" Bundle 'nvie/vim-flake8' |
|
|
|
" Bundle 'nvie/vim-flake8' |
|
|
|
" Bundle 'klen/python-mode' |
|
|
|
Bundle 'klen/python-mode' |
|
|
|
Bundle 'scrooloose/syntastic' |
|
|
|
Bundle 'scrooloose/syntastic' |
|
|
|
|
|
|
|
|
|
|
|
" snippets |
|
|
|
" snippets |
|
|
|
" Bundle 'msanders/snipmate.vim' |
|
|
|
Bundle 'msanders/snipmate.vim' |
|
|
|
Bundle "MarcWeber/vim-addon-mw-utils" |
|
|
|
" Bundle "MarcWeber/vim-addon-mw-utils" |
|
|
|
Bundle "tomtom/tlib_vim" |
|
|
|
" Bundle "tomtom/tlib_vim" |
|
|
|
Bundle "garbas/vim-snipmate" |
|
|
|
" Bundle "garbas/vim-snipmate" |
|
|
|
|
|
|
|
|
|
|
|
" fuzzy file open |
|
|
|
" fuzzy file open |
|
|
|
Bundle 'kien/ctrlp.vim' |
|
|
|
Bundle 'kien/ctrlp.vim' |
|
|
@ -240,6 +241,7 @@ Bundle 'terryma/vim-multiple-cursors' |
|
|
|
|
|
|
|
|
|
|
|
" colorscheme |
|
|
|
" colorscheme |
|
|
|
Bundle 'croaker/mustang-vim' |
|
|
|
Bundle 'croaker/mustang-vim' |
|
|
|
|
|
|
|
Bundle "Ambient-Color-Scheme" |
|
|
|
" Bundle 'altercation/vim-colors-solarized' |
|
|
|
" Bundle 'altercation/vim-colors-solarized' |
|
|
|
color mustang " looks awesome on gvim, looks alright in vim if you have 256 color support |
|
|
|
color mustang " looks awesome on gvim, looks alright in vim if you have 256 color support |
|
|
|
|
|
|
|
|
|
|
@ -249,6 +251,9 @@ color mustang " looks awesome on gvim, looks alright in vim if you have 256 co |
|
|
|
" Improved syntax files |
|
|
|
" Improved syntax files |
|
|
|
Bundle 'Glench/Vim-Jinja2-Syntax' |
|
|
|
Bundle 'Glench/Vim-Jinja2-Syntax' |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" Identation guidelines |
|
|
|
|
|
|
|
Bundle 'nathanaelkane/vim-indent-guides' |
|
|
|
|
|
|
|
|
|
|
|
" auto-pair settings |
|
|
|
" auto-pair settings |
|
|
|
let g:AutoPairsMapCR = 1 |
|
|
|
let g:AutoPairsMapCR = 1 |
|
|
|
|
|
|
|
|
|
|
@ -334,3 +339,9 @@ let g:unite_winheight = 10 |
|
|
|
set wildignore+=*/build/*,*.egginfo,*.pyc,*.mo |
|
|
|
set wildignore+=*/build/*,*.egginfo,*.pyc,*.mo |
|
|
|
let g:ctrlp_extensions = ['funky'] |
|
|
|
let g:ctrlp_extensions = ['funky'] |
|
|
|
nnoremap <C-O> :CtrlPFunky<CR> |
|
|
|
nnoremap <C-O> :CtrlPFunky<CR> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
" ---------------------------------------------------------------------- |
|
|
|
|
|
|
|
" Indent guides |
|
|
|
|
|
|
|
" ---------------------------------------------------------------------- |
|
|
|
|
|
|
|
let g:indent_guides_start_level=2 |
|
|
|
|
|
|
|
let g:indent_guides_guide_size=1 |
|
|
|