From 2f73c918a7cea482d8d012d5d6256f3c445bbd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Fri, 25 Sep 2015 21:19:59 +0200 Subject: [PATCH] Clean vimrc. --- vim/vimrc | 181 ++++++++++++++++-------------------------------------- 1 file changed, 54 insertions(+), 127 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index a7d8e30..b60fd87 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -5,32 +5,35 @@ filetype off set rtp+=~/.vim/bundle/Vundle.vim/ call vundle#begin() -Plugin 'gmarik/vundle' +Plugin 'VundleVim/Vundle.vim' +Plugin 'bling/vim-airline' +Plugin 'godlygeek/tabular' +Plugin 'lepture/vim-jinja' +Plugin 'majutsushi/tagbar' +Plugin 'nblock/vim-dokuwiki' +Plugin 'reedes/vim-pencil' +Plugin 'saltstack/salt-vim' Plugin 'sickill/vim-monokai' +Plugin 'tpope/vim-commentary' +Plugin 'tpope/vim-fugitive' +Plugin 'tpope/vim-speeddating' +Plugin 'tpope/vim-surround' + +"Plugin 'Lokaltog/vim-easymotion' +"Plugin 'PeterRincker/vim-argumentative' +"Plugin 'Valloric/YouCompleteMe' +"Plugin 'flazz/vim-colorschemes' +"Plugin 'jmcantrell/vim-virtualenv' +"Plugin 'kien/ctrlp.vim' +"Plugin 'klen/python-mode' "Plugin 'mbbill/undotree' "Plugin 'scrooloose/nerdtree' -Plugin 'tpope/vim-surround' -Plugin 'tpope/vim-commentary' -Plugin 'Valloric/YouCompleteMe' -Plugin 'godlygeek/tabular' -Plugin 'bling/vim-airline' -Plugin 'tpope/vim-speeddating' -" Plugin 'tpope/vim-fugitive' -Plugin 'klen/python-mode' -Plugin 'nblock/vim-dokuwiki' -Plugin 'saltstack/salt-vim' -Plugin 'lepture/vim-jinja' -"Plugin 'terryma/vim-expand-region' -"Plugin 'wincent/Command-T' "Plugin 'sjl/gundo.vim' -Plugin 'kien/ctrlp.vim' -"Plugin 'PeterRincker/vim-argumentative' -"Plugin 'wellle/targets.vim' -"Plugin 'Lokaltog/vim-easymotion' +"Plugin 'terryma/vim-expand-region' "Plugin 'terryma/vim-multiple-cursors' -"Plugin 'flazz/vim-colorschemes' -Plugin 'reedes/vim-pencil' +"Plugin 'wellle/targets.vim' +"Plugin 'wincent/Command-T' call vundle#end() filetype plugin indent on @@ -42,7 +45,6 @@ set autoindent set autoread set backspace=indent,eol,start set backupcopy=no -set colorcolumn=79 set colorcolumn=80 set confirm set cursorline @@ -60,8 +62,11 @@ set hlsearch set ignorecase set incsearch set laststatus=2 +set lazyredraw set linebreak +set magic set matchpairs="(:),{:},[:],<:>" +set matchtime=5 set modeline set modelines=5 set mouse=a @@ -84,10 +89,9 @@ set shiftwidth=4 set shortmess=rti set showcmd set showmatch -set matchtime=5 set showmode set smartcase -set lazyredraw +set smartindent set smarttab set softtabstop=4 set swapfile @@ -112,109 +116,37 @@ set wildmenu set wildmode=list:longest set wrap set wrapscan -set magic - let mapleader = "\" map w: w! nnoremap w :w - -vmap y "+y -vmap d "+d -nmap p "+p -nmap P "+P -vmap p "+p -vmap P "+P - nmap za - map , : -vmap v (expand_region_expand) -vmap (expand_region_shrink) - vnoremap y y`] vnoremap p p`] nnoremap p p`] - -" enable 'very-magic' in regex -"nnoremap / /\v -"vnoremap / /\v - nnoremap , :nohlsearch noremap gV `[v`] -" make Y behave like other capitals, otherwise Y would work like yy map Y y$ - map j gj map k gk -"function! TrimWhiteSpace() -" %s/\s\+$//e -"endfunction - -" automatically reload .vimrc when it's saved -autocmd BufWritePost .vimrc source ~/.vimrc - -"autocmd FileWritePre * :call TrimWhiteSpace() -"autocmd FileAppendPre * :call TrimWhiteSpace() -"autocmd FilterWritePre * :call TrimWhiteSpace() -"autocmd BufWritePre * :call TrimWhiteSpace() - -" Start NERDTree when starting vim -"autocmd vimenter * NERDTree -"autocmd VimEnter * wincmd p -let NERDTreeQuitOnOpen = 1 -" close NERDTree when it's the only window left -"autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif - -"call togglebg#map("") - nnoremap h nnoremap j nnoremap k nnoremap l -nnoremap :NERDTreeToggle -nnoremap :TagbarToggle - " Autosave views when closing and restoring when opening again. autocmd BufWinLeave *.* mkview autocmd BufWinEnter *.* silent loadview -":inoremap pumvisible() ? '' : '' - -":au WinEnter * :setlocal number relativenumber -":au WinLeave * :setlocal nonumber norelativenumber - -""nnoremap -""nnoremap -""nnoremap -""nnoremap -""inoremap -""inoremap -""inoremap -""inoremap - nmap :bnext nmap :bprev -" default emacs movements for command line -cnoremap -cnoremap -cnoremap -cnoremap -cnoremap -cnoremap -cnoremap -cnoremap b -cnoremap f -cnoremap d -cnoremap - inoremap jj nnoremap v vl @@ -224,23 +156,6 @@ nmap ; :CtrlPBuffer " no more ex mode nnoremap Q -nnoremap r :%s/// - - -autocmd BufWritePre *.rst silent :%s/\s\+$//e -" setup for pymode -let g:pymode_trim_whitespaces = 1 -let g:pymode_lint_on_write = 0 -let g:pymode_lint_unmodified = 0 -let g:pymode_lint_on_fly = 0 -let g:pymode_rope = 0 -let g:pymode_rope_completion = 0 -"let g:pymode_rope_completion_on_dot = 1 -let g:pymode_rope_goto_definition_cmd = "new" -let g:pymode_syntax_all = 1 -let g:pymode_options = 1 - - " setup for the solarized color theme set background=dark let g:solarized_termcolors=16 @@ -250,21 +165,33 @@ let g:solarized_visibility="normal" syntax enable colorscheme monokai -" setup for vim-airline +nnoremap :TagbarToggle +let g:tagbar_map_jump = "i" +let g:tagbar_left = 0 +let g:tagbar_vertical = 0 +let g:tagbar_width = 50 +let g:tagbar_autoclose = 1 +let g:tagbar_autofocus = 1 +let g:tagbar_sort = 0 " 1: sort by name, 0: sort by position +let g:tagbar_compact = 1 +let g:tagbar_indent = 2 +let g:tagbar_show_linenumbers = 0 +let g:tagbar_foldlevel = 99 " unfold all + +let g:airline_right_sep = '' +let g:airline_left_sep = '' +let g:airline#extensions#disable_rtp_load = 1 +let g:airline_extensions = ['whitespace'] let g:airline_theme='powerlineish' -let g:airline_left_sep='' -let g:airline_right_sep='' -let g:airline_section_x = '%{PencilMode()}' +let g:airline_section_x = airline#section#create(['%{tagbar#currenttag("%s", "", "f")}','' , ' %{PencilMode()}', ' [', 'filetype', ']']) let g:pencil#mode_indicators = {'hard': 'H', 'auto': 'A', 'soft': 'S', 'off': '',} -"let g:airline_section_z='' +let g:airline#extensions#whitespace#enabled = 1 +let g:airline#extensions#whitespace#symbol = '' +let g:airline#extensions#whitespace#checks = ['trailing'] -" enable tabline at the top showing all buffers -"let g:airline#extensions#tabline#enabled = 1 - -let g:ycm_complete_in_comments = 0 -let g:ycm_complete_in_strings = 1 -let g:ycm_collect_identifiers_from_comments_and_strings = 0 -let g:ycm_seed_identifiers_with_syntax = 1 -let g:ycm_add_preview_to_completeopt = 1 -let g:ycm_autoclose_preview_window_after_completion = 1 -let g:ycm_autoclose_preview_window_after_insertion = 1 +function! DeleteTrailingWS() + exe "normal mz" + %s/\s\+$//e + exe "normal `z" +endfunction +autocmd BufWrite * :call DeleteTrailingWS()