From 1ebcb1eddea42f8b1911fde06909fda3ecaeae86 Mon Sep 17 00:00:00 2001
From: David Phillips <david@yeah.nah.nz>
Date: Sun, 20 Sep 2020 20:12:18 +1200
Subject: Misc updates

---
 vimrc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'vimrc')

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
-- 
cgit v1.1