Greatly simplify vim configuration
This commit is contained in:
parent
2dbb1fa153
commit
4bdb52b1cb
98
.vimrc
98
.vimrc
@ -4,10 +4,6 @@ if empty(glob('~/.vim/autoload/plug.vim'))
|
||||
endif
|
||||
call plug#begin()
|
||||
|
||||
" Plug packages without settings {{{1
|
||||
Plug 'tpope/vim-surround'
|
||||
Plug 'tpope/vim-commentary'
|
||||
|
||||
" Improved Incremental Search
|
||||
Plug 'haya14busa/incsearch.vim'
|
||||
map / <Plug>(incsearch-forward)
|
||||
@ -19,78 +15,6 @@ map n <Plug>(incsearch-nohl-n)
|
||||
map N <Plug>(incsearch-nohl-N)
|
||||
map * <Plug>(incsearch-nohl-*)
|
||||
|
||||
" Syntax Checking {{{1
|
||||
Plug 'vim-syntastic/syntastic'
|
||||
let g:syntastic_check_on_wq = 0
|
||||
|
||||
" netrw
|
||||
let g:netrw_liststyle = 3
|
||||
let g:netrw_banner = 1
|
||||
|
||||
" Ctrl-p {{{1
|
||||
Plug 'kien/ctrlp.vim'
|
||||
let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
|
||||
set wildignore+=*/tmp/*,*.so,*.swp,*.zip
|
||||
let g:ctrlp_user_command = { 'types': { 1: ['.git', 'cd %s && git ls-files . -co --exclude-standard'], }, 'fallback': 'find %s -type f' }
|
||||
|
||||
" JSON Support {{{1
|
||||
Plug 'elzr/vim-json'
|
||||
let g:vim_json_syntax_conceal = 0
|
||||
|
||||
" Tmux Integration {{{1
|
||||
Plug 'christoomey/vim-tmux-navigator'
|
||||
nnoremap <silent> <C-Left> :TmuxNavigateLeft<cr>
|
||||
nnoremap <silent> <C-Down> :TmuxNavigateDown<cr>
|
||||
nnoremap <silent> <C-Up> :TmuxNavigateUp<cr>
|
||||
nnoremap <silent> <C-Right> :TmuxNavigateRight<cr>
|
||||
|
||||
" Color Scheme {{{1
|
||||
Plug 'altercation/vim-colors-solarized'
|
||||
let g:solarized_termcolors=256
|
||||
let g:solarized_termtrans=1
|
||||
let g:solarized_contrast="normal"
|
||||
let g:solarized_visibility="normal"
|
||||
set background=light
|
||||
colorscheme solarized
|
||||
highlight ColorColumn ctermbg=0 guibg=#eee8d5
|
||||
|
||||
" DelimitMate {{{1
|
||||
Plug 'Raimondi/delimitMate'
|
||||
let delimitMate_expand_cr = 1
|
||||
|
||||
" Airline {{{1
|
||||
Plug 'vim-airline/vim-airline'
|
||||
Plug 'vim-airline/vim-airline-themes'
|
||||
let g:airline_theme='solarized'
|
||||
let g:airline_powerline_fonts = 1
|
||||
let g:airline#extensions#tabline#enabled = 1 " Tab bar at top
|
||||
if !exists('g:airline_symbols')
|
||||
let g:airline_symbols = {}
|
||||
endif
|
||||
let g:airline_symbols.space = "\ua0"
|
||||
if has('statusline')
|
||||
set laststatus=2
|
||||
set statusline=%<%f\ " Filename
|
||||
set statusline+=%w%h%m%r " Options
|
||||
set statusline+=\ [%{&ff}/%Y] " Filetype
|
||||
set statusline+=\ [%{getcwd()}] " Current dir
|
||||
set statusline+=%=%-14.(%l,%c%V%)\ %p%% " Right aligned file nav info
|
||||
endif
|
||||
|
||||
" Golang Support {{{1
|
||||
Plug 'fatih/vim-go'
|
||||
au FileType go nmap <Leader>gi <Plug>(go-info)
|
||||
au FileType go nmap <Leader>gl <Plug>(go-metalinter)
|
||||
let g:go_highlight_types = 1
|
||||
let g:go_highlight_build_constraints = 1
|
||||
let g:go_auto_type_info = 0
|
||||
let g:go_fmt_command = "goimports"
|
||||
let g:go_metalinter_autosave = 1
|
||||
let g:go_metalinter_autosave_enabled = ['vet', 'golint', 'errcheck', 'varcheck']
|
||||
let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck', 'varcheck', 'ineffassign', 'megacheck', 'interfacer', 'maligned']
|
||||
let g:go_metalinter_deadline = '20s'
|
||||
|
||||
|
||||
call plug#end()
|
||||
filetype plugin indent on
|
||||
|
||||
@ -108,12 +32,8 @@ highlight clear CursorLineNr " Remove highlight color from current line numbe
|
||||
highlight clear SignColumn " SignColumn should match background
|
||||
highlight clear LineNr " Current line number row will have same background color in relative mode
|
||||
set textwidth=80
|
||||
au FileType json setlocal textwidth=150
|
||||
set colorcolumn=+1
|
||||
|
||||
set list " Highlight white-space characters
|
||||
set listchars=tab:›\ ,trail:•,extends:#,nbsp:. " but only the ones we don't want
|
||||
|
||||
" Splits {{{1
|
||||
map <C-J> <C-W>j<C-W>_
|
||||
map <C-K> <C-W>k<C-W>_
|
||||
@ -146,13 +66,6 @@ if has('persistent_undo')
|
||||
set undoreload=10000 " Maximum number lines to save for undo on a buffer reload
|
||||
endif
|
||||
|
||||
" Git {{{1
|
||||
|
||||
au FileType gitcommit set tw=72 " Override the line length for git commits
|
||||
|
||||
" Always start the cursor at the top left corner in a commit message
|
||||
au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0])
|
||||
|
||||
" Other Settings {{{1
|
||||
|
||||
set history=1000 " Greatly increase the size of the history (from 20)
|
||||
@ -165,14 +78,3 @@ xnoremap & :&&<CR> " loses the flags, this fixes that.
|
||||
|
||||
let g:clang_user_options='|| exit 0'
|
||||
|
||||
set wildmenu " Show a menu rather than auto-completing
|
||||
|
||||
" autocompletion
|
||||
:inoremap <C-j> <Esc>/[)}"'\]>]<CR>:nohl<CR>a
|
||||
" Enable omni completion.
|
||||
autocmd FileType css setlocal omnifunc=csscomplete#CompleteCSS
|
||||
autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
|
||||
autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
|
||||
autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
|
||||
autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user