From 11404c22f775aae194477e21b7a2b14b3219685a Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Sat, 12 Jul 2014 20:17:18 +0200 Subject: vim: added modeline, changed indentation; updated submodules --- vim/bundle/ag | 2 +- vim/bundle/airline | 2 +- vim/bundle/fugitive | 2 +- vim/bundle/syntastic | 2 +- vimrc | 92 +++++++++++++++++++++++++++------------------------- 5 files changed, 51 insertions(+), 49 deletions(-) diff --git a/vim/bundle/ag b/vim/bundle/ag index 84905e4..d3a00f8 160000 --- a/vim/bundle/ag +++ b/vim/bundle/ag @@ -1 +1 @@ -Subproject commit 84905e453b120ae3e7c297f2fad8a6de40f72856 +Subproject commit d3a00f8affb091e7a14eb34f1beb9db9bb57a4bf diff --git a/vim/bundle/airline b/vim/bundle/airline index 3ab1bb7..936e2b6 160000 --- a/vim/bundle/airline +++ b/vim/bundle/airline @@ -1 +1 @@ -Subproject commit 3ab1bb7eb0e533f4512dc2199a50d1238abcbb42 +Subproject commit 936e2b6a66b5ddab85676433128792499fac68b0 diff --git a/vim/bundle/fugitive b/vim/bundle/fugitive index 8576741..9af975c 160000 --- a/vim/bundle/fugitive +++ b/vim/bundle/fugitive @@ -1 +1 @@ -Subproject commit 8576741d61126354e4f739e4112985cec651e2e3 +Subproject commit 9af975c82c99318b908c61b12e443e8ba6dea217 diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index 0bef7ef..572d3e0 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 0bef7ef3f608f162eba0daee63acd13b3456efcb +Subproject commit 572d3e0ebc60b7339eed15c88a90338a23d5160f diff --git a/vimrc b/vimrc index e43a23a..234b3f1 100644 --- a/vimrc +++ b/vimrc @@ -3,33 +3,33 @@ runtime bundle/pathogen/autoload/pathogen.vim execute pathogen#infect() runtime ftplugin/man.vim -set nocompatible " don't be compatible to vi -set showcmd " show entered commands in status line -set showmatch " show matching brackets -set autoindent " indent new lines correctly -set hlsearch " highlight search results -set ignorecase " case-insensitive searching -set background=dark " color scheme for dark background -set title " set terminal title -set ruler " show line/column of cursor in status line -set tabstop=4 " display a tab as 4 spaces -"set softtabstop=4 " (soft) indent tabs with 4 spaces -set shiftwidth=4 " (auto)indent with 4 spaces (> <) -set noexpandtab " don't expand tabs to spaces -set nobackup " don't keep backup files -set showtabline=2 " always show tab line -set hidden " change buffers without saving -set cursorline " highlight current cursor line -set scrolloff=4 " keep 4 lines context when scrolling -set laststatus=2 " always show status line -set ttimeoutlen=50 " faster switch from insert to normal mode -set noshowmode " don't show current mode (done by airline) -set encoding=utf-8 " use utf8 by default -syntax on " enable syntax highlighting +set nocompatible " don't be compatible to vi +set showcmd " show entered commands in status line +set showmatch " show matching brackets +set autoindent " indent new lines correctly +set hlsearch " highlight search results +set ignorecase " case-insensitive searching +set background=dark " color scheme for dark background +set title " set terminal title +set ruler " show line/column of cursor in status line +set tabstop=4 " display a tab as 4 spaces +"set softtabstop=4 " (soft) indent tabs with 4 spaces +set shiftwidth=4 " (auto)indent with 4 spaces (> <) +set noexpandtab " don't expand tabs to spaces +set nobackup " don't keep backup files +set showtabline=2 " always show tab line +set hidden " change buffers without saving +set cursorline " highlight current cursor line +set scrolloff=4 " keep 4 lines context when scrolling +set laststatus=2 " always show status line +set ttimeoutlen=50 " faster switch from insert to normal mode +set noshowmode " don't show current mode (done by airline) +set encoding=utf-8 " use utf8 by default +syntax on " enable syntax highlighting filetype plugin indent on -set directory=~/.vim/swap,.,~/tmp,/var/tmp,/tmp " directory where to save/search swap files -set viminfo+=n~/.vim/viminfo " different location for viminfo file +set directory=~/.vim/swap,.,~/tmp,/var/tmp,/tmp " directory where to save/search swap files +set viminfo+=n~/.vim/viminfo " different location for viminfo file " make indentation and trailing whitespaces visible set list listchars=tab:\ \ ,trail:ยท @@ -45,9 +45,9 @@ autocmd InsertLeave * if &number | set relativenumber | endif " show cursorline only in active window augroup CursorLine - autocmd! - autocmd VimEnter,WinEnter,BufWinEnter * set cursorline - autocmd WinLeave * set nocursorline + autocmd! + autocmd VimEnter,WinEnter,BufWinEnter * set cursorline + autocmd WinLeave * set nocursorline augroup END " highlighting settings @@ -65,29 +65,30 @@ endif " file browser -let g:netrw_liststyle=3 " tree style listing -let g:netrw_banner=0 " suppress banner on top -"let g:netrw_browse_split=3 " open files in new tab -let g:netrw_list_hide='^\..*$' " don't show hidden files +let g:netrw_liststyle=3 " tree style listing +let g:netrw_banner=0 " suppress banner on top +"let g:netrw_browse_split=3 " open files in new tab +let g:netrw_list_hide='^\..*$' " don't show hidden files " key mappings -nnoremap :nohlsearch -nmap tn :tabnew -nmap tc :tabclose -noremap :BufExplorerHorizontalSplit -nnoremap :TagbarToggle -nnoremap :SyntasticCheck +nnoremap :nohlsearch +nmap tn :tabnew +nmap tc :tabclose +noremap :BufExplorerHorizontalSplit +nnoremap :TagbarToggle +nnoremap :SyntasticCheck " different keycodes in urxvt -nmap [5^ -nmap [6^ +nmap [5^ +nmap [6^ + " folding settings; disabled for now because of performance problems -"set foldmethod=syntax " fold automatically by syntax rules -"set foldlevel=0 " fold from top level -"set foldnestmax=1 " fold only 1 level +"set foldmethod=syntax " fold automatically by syntax rules +"set foldlevel=0 " fold from top level +"set foldnestmax=1 " fold only 1 level "let perl_fold=1 "let perl_nofold_packages=0 @@ -102,7 +103,8 @@ let g:airline_theme='wombat' let g:airline#extensions#whitespace#enabled=0 " Syntastic settings -let g:syntastic_check_on_wq=0 " don't check when closing buffers -let g:syntastic_aggregate_errors=1 " run every checker +let g:syntastic_check_on_wq=0 " don't check when closing buffers +let g:syntastic_aggregate_errors=1 " run every checker let g:syntastic_mode_map = { 'mode': 'passive' } +" vim: set et:sw=4:sts=4 -- cgit v1.2.3