Permalink
Browse files

vim-gutter

  • Loading branch information...
1 parent a03b085 commit 602275b8eedd8e52a2f54988f8fb09d8de6f5de8 @Detegr committed Mar 6, 2013
Showing with 43 additions and 19 deletions.
  1. +1 −0 .vim/colors/256-grayvim.vim
  2. +42 −19 .vim/vimrc
@@ -10,6 +10,7 @@ let c_gnu = 1
hi Normal ctermfg=253 ctermbg=235 cterm=None
+hi SignColumn ctermfg=253 ctermbg=235 cterm=None
hi Cursor ctermfg=Red ctermbg=None cterm=None
hi SpecialKey ctermfg=87 ctermbg=None cterm=Bold
hi Directory ctermfg=76 ctermbg=None cterm=None
View
@@ -8,14 +8,18 @@ call vundle#rc()
" required!
Bundle 'gmarik/vundle'
+"Bundle 'L9'
+"Bundle 'FuzzyFinder'
Bundle 'https://github.com/kien/ctrlp.vim'
-Bundle 'https://github.com/yandy/vim-omnicppcomplete.git'
+"Bundle 'https://github.com/yandy/vim-omnicppcomplete.git'
Bundle 'git://github.com/tpope/vim-surround.git'
Bundle 'AutoComplPop'
Bundle 'git://github.com/tpope/vim-fugitive.git'
-Bundle 'git://github.com/Rip-Rip/clang_complete.git'
-Bundle 'git://github.com/scrooloose/syntastic.git'
-Bundle 'git://github.com/powerman/vim-plugin-viewdoc.git'
+Bundle 'git://github.com/vim-scripts/javacomplete.git'
+Bundle 'git://github.com/Lokaltog/vim-powerline.git'
+Bundle 'git://github.com/mikewest/vimroom.git'
+Bundle 'https://github.com/Rip-Rip/clang_complete'
+Bundle 'git://github.com/airblade/vim-gitgutter.git'
set ts=4
set hidden
@@ -39,34 +43,40 @@ au BufEnter *.cpp set noexpandtab
au BufEnter *.py set noexpandtab
au BufEnter *.sh set noexpandtab
au BufEnter *.java set noexpandtab
+
+au BufEnter *.h set omnifunc=ClangComplete
+au BufEnter *.c set omnifunc=ClangComplete
+au BufEnter *.cpp set omnifunc=ClangComplete
+
au BufEnter *.rb set expandtab
au BufEnter *.rb set smartindent
au BufEnter *.rb set ts=2
au BufEnter *.rb set sw=2
au BufEnter *.rb set softtabstop
-
if has("gui_running")
colorscheme sonofobsidian
else
colorscheme 256-grayvim
endif
set guifont=ProggyCleanTT\ 12.5
-map <F12> :!ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
+"map <F12> :!ctags -R --sort=yes --c++-kinds=+p --fields=+iaS --extra=+q --c-kinds=+p .<CR>
+map <F12> :!ctags -R --sort=yes --c++-kinds=+p --fields=+S --c-kinds=+p .<CR><CR>
inoremap <C-Space> <C-x><C-o>
inoremap <Nul> <C-x><C-o>
noremap <Space> za
set tags+=~/.vim/tags/cpp
-let OmniCpp_ShowPrototypeInAbbr=1
-let OmniCpp_MayCompleteDot=1
-let OmniCpp_MayCompleteArrow=1
-let OmniCpp_MayCompleteScope=1
+"let OmniCpp_ShowPrototypeInAbbr=1
+"let OmniCpp_MayCompleteDot=1
+"let OmniCpp_MayCompleteArrow=1
+"let OmniCpp_MayCompleteScope=1
-set completeopt=menuone,menu,longest,preview
+set completeopt=longest,menuone
+"menuone,menu,longest
set foldmethod=manual
set foldnestmax=10
@@ -75,29 +85,42 @@ set foldlevel=1
set nowrap
let mapleader=","
+"nnoremap <leader>e :FufCoverageFile<cr>
nnoremap <leader>e :CtrlP<cr>
+"nnoremap <leader>b :FufBuffer<cr>
nnoremap <leader>b :CtrlPBuffer<cr>
+"nnoremap <leader>d :FufDir<cr>
nnoremap <leader>d :CtrlPDir<cr>
+"nnoremap <leader>o :FufFile<cr>
nnoremap <leader>m :CtrlPMRU<cr>
+nnoremap <leader>, :b#<cr>
nnoremap <leader>1 :diffget //2<cr>:diffupdate<cr>
nnoremap <leader>3 :diffget //3<cr>:diffupdate<cr>
nnoremap <leader>s :Gstatus<cr>
nnoremap <leader>c :Gcommit<cr>
-nnoremap <leader>, :b#<cr>
+"nnoremap <leader>w <C-w>k
+"nnoremap <leader>s <C-w>j
+"nnoremap <leader>a <C-w>h
+"nnoremap <leader>d <C-w>l
nnoremap <leader>q <C-w>c
nnoremap <leader>v :vsplit<cr>
inoremap jj <ESC>
-autocmd BufWinLeave * if expand("%") != "" | mkview | endif
-autocmd BufWinEnter * if expand("%") != "" | loadview | endif
-
-au BufNewFile,BufRead,BufEnter *.java inoremap <C-Space> <C-x><C-u>
-au BufNewFile,BufRead,BufEnter *.java inoremap <Nul> <C-x><C-u>
+"au BufWinLeave *.* mkview
+"au BufWinEnter *.* silent loadview
highlight Pmenu ctermbg=grey
highlight PmenuSel ctermfg=black ctermbg=yellow
-let g:viewdoc_open="belowright vnew"
-let g:viewdoc_only=1
+set laststatus=2 "For powerline
+let g:Powerline_symbols='compatible'
+
+let g:vimroom_background="#272822"
+
+set backupdir=$HOME/.vim/swp
+set directory=$HOME/.vim/swp
+
+hi CursorLine ctermbg=236 ctermfg=none cterm=none
+set cursorline

0 comments on commit 602275b

Please sign in to comment.