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

vimrc: Remove ESC mapping; additional changes

Browse source
This commit is contained in:
niblock 2017-07-28 18:37:09 -04:00
parent ff35f5d5ff
commit 45c4126735
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
vim/vimrc
View file

@ -52,15 +52,14 @@ set statusline= " Initialize it
set statusline+=%m%1*%r%0*%h " Modified, RO, Help flags set statusline+=%m%1*%r%0*%h " Modified, RO, Help flags
set statusline+=%2*%{&spell?'[SPELL]':''} " Spell flag set statusline+=%2*%{&spell?'[SPELL]':''} " Spell flag
set statusline+=%#StatusLine# set statusline+=%#StatusLine#
set statusline+=%{fugitive#statusline()} " Fugitive: Git branch " Show the Fugitive-provided status line, if Fugitive is installed
set statusline+=%{exists('g:loaded_fugitive')?fugitive#statusline():''}
set statusline+=%#Pmenu# " Color change (see :hi) set statusline+=%#Pmenu# " Color change (see :hi)
set statusline+=\ %F " Full-path to current buffer set statusline+=\ %F " Full-path to current buffer
set statusline+=%= " Switch to right-side set statusline+=%= " Switch to right-side
set statusline+=%y\ " Filetype set statusline+=%y\ " Filetype
set statusline+=%#StatusLine# " Color change (see :hi) set statusline+=%#StatusLine# " Color change (see :hi)
set statusline+=\|%4l\:%2c\| " Line and column set statusline+=\|%4l\:%2c\| " Line and column
set statusline+=%#SyntasticError# " Color change (see :hi_
set statusline+=%{SyntasticStatuslineFlag()} " Syntastic: Warnings/Errors
augroup user_stl_colors augroup user_stl_colors
autocmd! autocmd!
@ -72,8 +71,6 @@ augroup END
" Mappings " Mappings
" ============================================================================== " ==============================================================================
let mapleader = "," let mapleader = ","
" Remap ESC in insert mode
inoremap jk <esc>
" Make moving up/down work on wrapped lines of text " Make moving up/down work on wrapped lines of text
nnoremap <silent> j gj nnoremap <silent> j gj
nnoremap <silent> k gk nnoremap <silent> k gk
@ -88,11 +85,11 @@ cmap w!! w !sudo tee > /dev/null %
nnoremap <silent> <leader>rtw :%s/\s\+$//e<CR> nnoremap <silent> <leader>rtw :%s/\s\+$//e<CR>
" Open help topic in a full new tab " Open help topic in a full new tab
command! -nargs=1 -complete=help H :tabnew | :set buftype=help | :h <args> command! -nargs=1 -complete=help H :tabnew | :set buftype=help | :h <args>
" Show buffer list and prompt to choose one
nnoremap <leader>b :ls<CR>:b<space>
" Simple mapping to dotfiles directory (f = current tab; F = new tab) " Simple mapping to dotfiles directory (f = current tab; F = new tab)
nnoremap <silent> <leader>f :edit ~/.dotfiles/<CR> nnoremap <silent> <leader>f :edit ~/.dotfiles/<CR>
nnoremap <silent> <leader>F :tabnew ~/.dotfiles/<CR> nnoremap <silent> <leader>F :tabnew ~/.dotfiles/<CR>
" Emulatae vinegar.vim
nnoremap <silent> - :silent edit <C-R>=empty(expand('%')) ? '.' : expand('%:p:h')<CR><CR>
" ============================================================================== " ==============================================================================
" Plugins " Plugins
" ============================================================================== " ==============================================================================