dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging changes from linode

Browse source
This commit is contained in:
Dustin Swan 2011-12-14 16:43:44 -06:00
commit b6c6186a97
1 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
vimrc
View file

@ -16,7 +16,7 @@ set history=1000
set noswapfile set noswapfile
" persistent undo " persistent undo
if v:version > 700 if v:version > 703
set undodir=~/.vim/undodir set undodir=~/.vim/undodir
set undofile set undofile
endif endif
@ -29,7 +29,7 @@ set wildmenu
set wildmode=longest:full set wildmode=longest:full
" show the command as it is typed " show the command as it is typed
" set sc set sc
" remap the leader to ,. hate doing this but \ is so far away " remap the leader to ,. hate doing this but \ is so far away
let mapleader = "," let mapleader = ","
@ -79,10 +79,7 @@ let NERDTreeDirArrows=1
" Tagbar " Tagbar
nnoremap <silent> <leader>t :TagbarToggle <CR> nnoremap <silent> <leader>t :TagbarToggle <CR>
" Easy Motion " hide toolbar in macvim, etc
let g:EasyMotion_leader_key = '<Leader>e'
" hide toolbar in macvim, gvim
if has("gui_running") if has("gui_running")
set go=-t set go=-t
endif endif
@ -102,11 +99,11 @@ set statusline+=%15.(%c:%l/%L%)\ %P
set laststatus=2 set laststatus=2
" Syntastic " Syntastic
if v:version < 703 " turn off syntastic for old vim if v:version > 700
let g:loaded_syntastic_plugin = 1
else
let g:syntastic_enable_signs=1 let g:syntastic_enable_signs=1
let g:syntastic_auto_loc_list=1 let g:syntastic_auto_loc_list=1
else
let g:loaded_syntastic_plugin = 1
endif endif
" Highlight current line " Highlight current line
@ -117,23 +114,11 @@ if version > 702
set colorcolumn=80 set colorcolumn=80
endif endif
" quickly move between splits
" nnoremap <silent> <c-h> <c-w>h
" nnoremap <silent> <c-l> <c-w>l
" nnoremap <silent> <c-j> <c-w>j
" nnoremap <silent> <c-k> <c-w>k
" pretty line endings and trailing spaces " pretty line endings and trailing spaces
set list listchars=tab:»·,trail:·,eol:↪ set list listchars=tab:»·,trail:·,eol:↪
" set list listchars=tab:»·,trail:·,eol:·
" no arrows in insert mode " fine I'll try it
noremap <up> <nop>
noremap <down> <nop>
noremap <left> <nop>
noremap <right> <nop>
" fine I give up
inoremap jk <Esc> inoremap jk <Esc>
inoremap kj <Esc> inoremap kj <Esc>
" stop hitting Esc or c-[!
inoremap <Esc> <nop> inoremap <Esc> <nop>