summaryrefslogtreecommitdiff
path: root/vimrc
diff options
context:
space:
mode:
authorDavid Phillips <david@yeah.nah.nz>2020-09-20 20:12:18 +1200
committerDavid Phillips <david@yeah.nah.nz>2020-09-20 20:12:18 +1200
commit1ebcb1eddea42f8b1911fde06909fda3ecaeae86 (patch)
tree3ff1c49585d02f38b7440613b7688f1fe7bcd9ea /vimrc
parentbb564cb086aab16ffe91370e17afa8396739ac46 (diff)
downloaddotfiles-1ebcb1eddea42f8b1911fde06909fda3ecaeae86.tar.xz
Misc updates
Diffstat (limited to 'vimrc')
-rw-r--r--vimrc9
1 files changed, 7 insertions, 2 deletions
diff --git a/vimrc b/vimrc
index b7c7791..97a6e76 100644
--- a/vimrc
+++ b/vimrc
@@ -30,8 +30,11 @@ highlight ColorColumn ctermbg=234
match ExtraWhitespace /\s\+$/
inoremap <CR> <CR>x<BS>
+inoremap jj <ESC>
+inoremap jk <ESC>
nnoremap o ox<BS>
nnoremap O Ox<BS>
+set pastetoggle=<F2>
function! ToggleHlsearch()
if &hlsearch
@@ -49,11 +52,13 @@ nnoremap <C-_> :call ToggleHlsearch()<cr>
hi Todo ctermbg=DarkGreen ctermfg=Black
-set expandtab
+"set expandtab
autocmd BufRead,BufNewFile *.cli setfiletype xml
+autocmd BufRead,BufNewFile *.bnf setfiletype bnf
"autocmd FileType c setlocal expandtab
autocmd FileType make set noexpandtab
-autocmd FileType cpp setlocal expandtab
+"autocmd FileType cpp setlocal expandtab
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
autocmd FileType bitbake setlocal expandtab
autocmd FileType python setlocal expandtab
autocmd FileType haskell setlocal expandtab