Swapped to the latest version in use
This commit is contained in:
Alex Kelly
parent
5d8cfb4df7
commit
0893f0b304
1 changed files with 105 additions and 96 deletions
103
vim/vimrc
103
vim/vimrc
|
|
@ -1,54 +1,50 @@
|
||||||
set nocompatible
|
set nocompatible " required
|
||||||
set splitright
|
set splitright
|
||||||
filetype off
|
filetype off " required
|
||||||
" Handy hack to force a write using sudo when you forget to sudo vi
|
" Handy hack to force a write using sudo when you forget to 'sudo vi'
|
||||||
cmap w!! w !sudo tee > /dev/null %
|
cmap w!! w !sudo tee > /dev/null %
|
||||||
set rtp+=~/.vim/bundle/vundle/
|
|
||||||
set pastetoggle=<F10>
|
|
||||||
set incsearch
|
|
||||||
set encoding=utf8
|
|
||||||
|
|
||||||
call vundle#rc()
|
set pastetoggle=<F10>
|
||||||
"We are going to try the wrapping functions. We'll see how that works
|
|
||||||
"Python has nowrap set, so this generally shouldn't suck
|
set incsearch
|
||||||
|
set encoding=utf-8
|
||||||
set wrap
|
set wrap
|
||||||
set linebreak
|
set linebreak
|
||||||
set nolist
|
set nolist
|
||||||
|
|
||||||
" let Vundle manage Vundle
|
" set the runtime path to include Vundle and initialize
|
||||||
" required!
|
set rtp+=~/.vim/bundle/Vundle.vim
|
||||||
Plugin 'gmarik/vundle'
|
call vundle#begin()
|
||||||
Plugin 'Lokaltog/powerline', {'rtp': 'powerline/bindings/vim/'}
|
|
||||||
"Plugin 'bling/vim-airline'
|
" alternatively, pass a path where Vundle should install plugins
|
||||||
Plugin 'tpope/vim-fugitive'
|
"call vundle#begin('~/some/path/here')
|
||||||
|
|
||||||
|
" let Vundle manage Vundle, required
|
||||||
|
Plugin 'gmarik/Vundle.vim'
|
||||||
|
Plugin 'Valloric/YouCompleteMe'
|
||||||
|
Plugin 'vim-syntastic/syntastic'
|
||||||
|
Plugin 'nvie/vim-flake8'
|
||||||
|
Plugin 'python-mode/python-mode'
|
||||||
|
Plugin 'airblade/vim-gitgutter'
|
||||||
Plugin 'scrooloose/nerdtree'
|
Plugin 'scrooloose/nerdtree'
|
||||||
Plugin 'klen/python-mode'
|
Plugin 'powerline/powerline', {'rtp': 'powerline/bindings/vim'}
|
||||||
|
Plugin 'flazz/vim-colorschemes'
|
||||||
Plugin 'davidhalter/jedi-vim'
|
Plugin 'davidhalter/jedi-vim'
|
||||||
Plugin 'ervandew/supertab'
|
Plugin 'ervandew/supertab'
|
||||||
Plugin 'Rykka/riv.vim'
|
" Bind zonefile stuff
|
||||||
Plugin 'Rykka/clickable.vim'
|
|
||||||
Plugin 'seveas/bind.vim'
|
Plugin 'seveas/bind.vim'
|
||||||
Plugin 'altercation/vim-colors-solarized'
|
" extline extends rst stuff
|
||||||
Plugin 'flazz/vim-colorschemes'
|
|
||||||
Plugin 'drmikehenry/vim-extline'
|
Plugin 'drmikehenry/vim-extline'
|
||||||
Plugin 'tpope/vim-surround.git'
|
Plugin 'tpope/vim-surround.git'
|
||||||
Plugin 'ryanoasis/vim-webdevicons'
|
Plugin 'ryanoasis/vim-webdevicons'
|
||||||
Plugin 'terryma/vim-multiple-cursors'
|
|
||||||
Plugin 'Valloric/YouCompleteMe'
|
|
||||||
Plugin 'brookhong/DBGPavim'
|
Plugin 'brookhong/DBGPavim'
|
||||||
Plugin 'tbabej/taskwiki'
|
|
||||||
Plugin 'airblade/vim-gitgutter'
|
|
||||||
|
|
||||||
filetype plugin indent on
|
" Add all your plugins here (note older versions of Vundle used Bundle instead
|
||||||
|
" of Plugin)
|
||||||
augroup vimrc_autocmds
|
|
||||||
autocmd!
|
|
||||||
" highlight characters past column 80
|
|
||||||
autocmd FileType python highlight Excess ctermbg=DarkGrey guibg=Black
|
|
||||||
autocmd FileType python match Excess /\%80v.*/
|
|
||||||
autocmd FileType python set nowrap
|
|
||||||
augroup END
|
|
||||||
|
|
||||||
|
" All of your Plugins must be added before the following line
|
||||||
|
call vundle#end() " required
|
||||||
|
filetype plugin indent on " required
|
||||||
"Powerline setup
|
"Powerline setup
|
||||||
"set guifont=PowerLineSymbols\ DejaVu\ Sans\ Mono\ for\ Powerline\ 9
|
"set guifont=PowerLineSymbols\ DejaVu\ Sans\ Mono\ for\ Powerline\ 9
|
||||||
" set guifont=DejaVu\ Sans\ Mono\ for\ Powerline\ Plus\ Nerd\ File\ Types\ 9
|
" set guifont=DejaVu\ Sans\ Mono\ for\ Powerline\ Plus\ Nerd\ File\ Types\ 9
|
||||||
|
|
@ -61,6 +57,27 @@ set laststatus=2
|
||||||
"NerdTree map to <f2>
|
"NerdTree map to <f2>
|
||||||
map <F2> :NERDTreeToggle<CR>
|
map <F2> :NERDTreeToggle<CR>
|
||||||
|
|
||||||
|
colorscheme jellybeans
|
||||||
|
|
||||||
|
"Make python-friendly tabs
|
||||||
|
set tabstop=4
|
||||||
|
set shiftwidth=4
|
||||||
|
set smarttab
|
||||||
|
set softtabstop=4
|
||||||
|
set autoindent
|
||||||
|
let &colorcolumn="80,".join(range(81,999),",")
|
||||||
|
|
||||||
|
augroup vimrc_autocmds
|
||||||
|
autocmd!
|
||||||
|
"highlight characters past col 80
|
||||||
|
autocmd FileType python highlight Excess ctermbg=DarkGrey guibg=Black
|
||||||
|
autocmd FileType python match Excess /\%80v.*/
|
||||||
|
autocmd FileType python set nowrap
|
||||||
|
augroup END
|
||||||
|
|
||||||
|
set mouse=a
|
||||||
|
|
||||||
|
" python-mode settings
|
||||||
" Python-mode
|
" Python-mode
|
||||||
" Activate rope
|
" Activate rope
|
||||||
" Keys:
|
" Keys:
|
||||||
|
|
@ -86,7 +103,8 @@ let g:pymode_doc_key = 'K'
|
||||||
|
|
||||||
"Linting
|
"Linting
|
||||||
let g:pymode_lint = 1
|
let g:pymode_lint = 1
|
||||||
let g:pymode_lint_checker = "pyflakes,pep8"
|
"let g:pymode_lint_checker = "pyflakes,pep8"
|
||||||
|
let g:pymode_lint_checker = "flake8,pep8"
|
||||||
" Auto check on save
|
" Auto check on save
|
||||||
let g:pymode_lint_write = 1
|
let g:pymode_lint_write = 1
|
||||||
|
|
||||||
|
|
@ -108,18 +126,9 @@ let g:pymode_folding = 0
|
||||||
let g:riv_fold_level = 0
|
let g:riv_fold_level = 0
|
||||||
let g:riv_fold_auto_update = 0
|
let g:riv_fold_auto_update = 0
|
||||||
|
|
||||||
colorscheme jellybeans
|
|
||||||
"setlocal spell spelllang=en_us
|
|
||||||
set mouse=a
|
|
||||||
|
|
||||||
"Make python-friendly tabs
|
|
||||||
set tabstop=4
|
|
||||||
set shiftwidth=4
|
|
||||||
set smarttab
|
|
||||||
set softtabstop=4
|
|
||||||
set autoindent
|
|
||||||
let &colorcolumn="80,".join(range(81,999),",")
|
|
||||||
|
|
||||||
let g:dbgPavimPort = 9000
|
let g:dbgPavimPort = 9000
|
||||||
let g:dbgPavimBreakAtEntry = 0
|
let g:dbgPavimBreakAtEntry = 0
|
||||||
let g:dbgPavimOnce = 1
|
let g:dbgPavimOnce = 1
|
||||||
|
|
||||||
|
let python_highlight_all=1
|
||||||
|
syntax on
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue