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

---
 XCompose | 2 ++
 vimrc    | 9 +++++++--
 zshrc    | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/XCompose b/XCompose
index 6df91d5..a9f2218 100644
--- a/XCompose
+++ b/XCompose
@@ -77,6 +77,8 @@ include "/usr/share/X11/locale/en_US.UTF-8/Compose"
 <Multi_key> <F> <L> <I> <P>                    : "(╯°□°）╯︵ ┻━┻"
 <Multi_key> <p> <u> <t>                        : "ノ( ゜-゜ノ)"
 <Multi_key> <d> <o> <n> <g>                    : "ヽ༼ຈلຈ༽ﾉ"
+<Multi_key> <t> <i> <n> <y>                    : "🤏"
+<Multi_key> <e> <y> <e> <s>                    : "👀"
 
 # BLACKBOARD BOLD UPPERCASE, 1 0
 <Multi_key> <B> <A>                            : "𝔸"
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
diff --git a/zshrc b/zshrc
index c79dad1..6257fcb 100644
--- a/zshrc
+++ b/zshrc
@@ -23,6 +23,9 @@ key[Insert]="$terminfo[kich1]"
 key[Backspace]="$terminfo[kbs]"
 key[Delete]="$terminfo[kdch1]"
 
+bindkey -e
+bindkey "^R" history-incremental-search-backward
+
 # setup key accordingly
 [[ -n "$key[Home]"      ]] && bindkey -- "$key[Home]"      beginning-of-line
 [[ -n "$key[End]"       ]] && bindkey -- "$key[End]"       end-of-line
-- 
cgit v1.1