some more stuff

This commit is contained in:
Andrew Tomaka 2016-08-18 19:10:48 -04:00
parent eafa67f1b8
commit e1517026fc

20
vimrc
View file

@ -7,11 +7,12 @@ Plug 'nanotech/jellybeans.vim'
" keepers " keepers
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'atomaka/renamefile.vim'
Plug 'atomaka/ZoomWin' " vim-scripts not up to date Plug 'atomaka/ZoomWin' " vim-scripts not up to date
Plug 'bronson/vim-trailing-whitespace' Plug 'bronson/vim-trailing-whitespace'
Plug 'ctrlpvim/ctrlp.vim' Plug 'ctrlpvim/ctrlp.vim'
Plug 'rbgrouleff/bclose.vim' Plug 'rbgrouleff/bclose.vim'
Plug 'tpope/vim-endwise'
Plug 'tpope/vim-eunuch'
Plug 'tpope/vim-surround' Plug 'tpope/vim-surround'
" languages " languages
@ -30,11 +31,11 @@ call plug#end()
filetype plugin indent on filetype plugin indent on
" STATUS LINE " STATUS LINE
set statusline=%<\ %{GitState()}%f%{ZoomState()}\ %m%r%y%w%=%l\/%-6L\ %3c\ set statusline=%<\ %f%{ZoomState()}\ %m%r%y%w%=\ Line:\ %l\/%L\ [%p%%]\ Col:\ %c\ Buf:\ #%n\
" OPTIONS " OPTIONS
set fileformats=unix,mac,dos " File format prefer unix endings set fileformats=unix,mac,dos " File format prefer unix endings
set endofline " Add newlien at end of file set endofline " Add newline at end of file
set shellslash " Forward slashes set shellslash " Forward slashes
set nobackup " No backup files set nobackup " No backup files
set noswapfile " Hope for the best set noswapfile " Hope for the best
@ -66,6 +67,7 @@ set scrolloff=3 " Keep cursor from touching edges
set timeoutlen=500 " Don't wait too long (ambiguous leaders) set timeoutlen=500 " Don't wait too long (ambiguous leaders)
set showmatch " Show matching brackets set showmatch " Show matching brackets
set hidden " Allow unsaved buffers to be hidden set hidden " Allow unsaved buffers to be hidden
set wildcharm=<tab> " Allow use of tab in macros
set wildmenu " Command line completion set wildmenu " Command line completion
set wildmode=list:longest,full " Better file completion set wildmode=list:longest,full " Better file completion
set infercase " Adjust completions to match case set infercase " Adjust completions to match case
@ -78,6 +80,10 @@ set softtabstop=2
set shiftwidth=2 set shiftwidth=2
set expandtab set expandtab
set shiftround " make >> go to next tab set shiftround " make >> go to next tab
" some performance stuff
set lazyredraw
set ttyfast
set synmaxcol=256
" Show whitespace markers before cursor in insert mode " Show whitespace markers before cursor in insert mode
set list listchars=tab:\ \ ,trail set list listchars=tab:\ \ ,trail
" Ignore stuff " Ignore stuff
@ -131,9 +137,10 @@ nnoremap <silent> <Leader>BD :Bclose!<CR>
" other " other
map <Leader>fw :FixWhitespace<cr> map <Leader>fw :FixWhitespace<cr>
map <Leader>pm :set paste!<cr> map <Leader>pm :set paste!<cr>
map <Leader>sa :RenameFile<cr> map <Leader>sa :Move %<tab>
map <Leader>se :e ~/.vimrc<cr> map <Leader>se :e ~/.vimrc<cr>
map <Leader>sc :pclose<cr> map <Leader>sc :pclose<cr>
map <Leader>sw :SudoWrite<cr>
map <Leader>sz :so ~/.vimrc<cr> map <Leader>sz :so ~/.vimrc<cr>
" PLUGIN CONFIGURATION " PLUGIN CONFIGURATION
@ -141,11 +148,6 @@ map <Leader>sz :so ~/.vimrc<cr>
colorscheme jellybeans colorscheme jellybeans
syntax enable syntax enable
" fugitive
function! GitState()
return system("[[ -n \"$(git status --porcelain " . shellescape(expand("%")) . ")\" ]] && echo -n +")
endfunction
" go " go
let g:go_fmt_command = "goimports" let g:go_fmt_command = "goimports"