diff options
| author | Tharre <tharre3@gmail.com> | 2015-12-08 16:15:39 +0100 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2016-10-07 20:13:39 +0000 |
| commit | 5616842ba98ddc701398f3e54cd57a53d7aad190 (patch) | |
| tree | def7bfdbf2c0ca9629dfb772a9151ad577643ef2 /shell | |
| parent | 1d78c8231a0159aa88b17e57f249adb2065a1c7e (diff) | |
| download | dotfiles-5616842ba98ddc701398f3e54cd57a53d7aad190.tar.gz dotfiles-5616842ba98ddc701398f3e54cd57a53d7aad190.tar.xz dotfiles-5616842ba98ddc701398f3e54cd57a53d7aad190.zip | |
vim: restructure .vimrc
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/_vimrc | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/shell/_vimrc b/shell/_vimrc index f72d11f..cecabd0 100644 --- a/shell/_vimrc +++ b/shell/_vimrc @@ -13,7 +13,7 @@ set nocompatible " Be iMproved let mapleader="," " set leader early as otherwise it wouldn't work filetype plugin indent on -" ----- general settings ----- +" ========== general settings ========== set encoding=utf-8 set ff=unix set number @@ -35,6 +35,11 @@ set tabstop=4 set shiftwidth=4 set textwidth=80 set cc=81 +"set expandtab + +syntax enable +set background=dark +colorscheme distinguished set list set listchars=tab:>-,trail:~ @@ -44,6 +49,11 @@ set wildmenu set relativenumber +set wildignore+=*.a,*.o,*.class +set wildignore+=*.bmp,*.gif,*.ico,*.jpg,*.jpeg,*.png +set wildignore+=.DS_Store,.git,.hg,.svn +set wildignore+=*~,*.swp,*.tmp + " jk is escape inoremap jk <esc> @@ -59,25 +69,27 @@ map <silent> <leader>3 :diffget 4<CR> :diffupdate<CR> autocmd InsertEnter * :let @/="" autocmd InsertLeave * :let @/="" -"set expandtab - map Q @ map <S-m> :tabprevious<CR> map m :tabnext<CR> -syntax enable -set background=dark -colorscheme distinguished - " remove trailing whitespaces on save autocmd BufWritePre * :%s/\s\+$//e " save file with root permissions cmap w!! w !sudo tee % >/dev/null +" turn off search highlight +nnoremap <leader><space> :nohlsearch<CR> + +" ========== file specific settings ========== " Markdown autocmd BufRead,BufNew *.md set filetype=markdown +" java +au BufNewFile,BufRead *.java set tabstop=4 softtabstop=4 shiftwidth=4 smarttab autoindent cc=121 + +" ========== plugin settings ========== " airline set laststatus=2 let g:airline_theme = 'powerlineish' @@ -92,24 +104,13 @@ vmap <Enter> <Plug>(EasyAlign) " Start interactive EasyAlign for a motion/text object (e.g. gaip) nmap ga <Plug>(EasyAlign) -" java -au BufNewFile,BufRead *.java set tabstop=4 softtabstop=4 shiftwidth=4 smarttab autoindent cc=121 +" toggle gundo +nnoremap <leader>u :GundoToggle<CR> " eclim nmap <leader>a :JavaImportOrganize<cr> nmap <leader>t :ProjectTree<cr> nmap <leader>o :ProjectOpen<cr> -" toggle gundo -nnoremap <leader>u :GundoToggle<CR> - -" turn off search highlight -nnoremap <leader><space> :nohlsearch<CR> - -set wildignore+=*.a,*.o,*.class -set wildignore+=*.bmp,*.gif,*.ico,*.jpg,*.jpeg,*.png -set wildignore+=.DS_Store,.git,.hg,.svn -set wildignore+=*~,*.swp,*.tmp - " ctrlp let g:ctrlp_max_files = 1000000 |