[vifm] Add <c-{h,l}> mappings

2 files changed, 14 insertions, 10 deletions

diff --git a/vifm/.config/vifm/vifmrc b/vifm/.config/vifm/vifmrc
index f3d2b7d..bb719a2 100644
--- a/vifm/.config/vifm/vifmrc
+++ b/vifm/.config/vifm/vifmrc
@@ -31,6 +31,8 @@ nnoremap ,r :%rename<cr>
 nnoremap ,t :!urxvt &<cr>
 nnoremap ,l :!less %f<cr>
 nnoremap <c-d> :q<cr>
+nnoremap <c-l> <c-w>l
+nnoremap <bs> <c-w>h
 
 " To disable automatic tagging of search results
 nnoremap coh :set hlsearch!<cr>
diff --git a/vim/.vimrc b/vim/.vimrc
index 2b10b4d..87647ab 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -165,7 +165,17 @@ nnoremap cpd :OnlineThesaurusCurrentWord<cr>
 nnoremap ,pi :PlugInstall<cr>
 nnoremap ,pu :PlugUpdate<cr>
 nnoremap ,pc :PlugClean<cr>
-nnoremap <buffer> <nowait> <expr> ,p Remembrall(',p')
+
+" Remembrall
+if &runtimepath =~ 'remembrall'
+    nnoremap <buffer> <nowait> <expr> ,p Remembrall(',p')
+    nnoremap <silent> ,, :call remembrall#remind('n', '')<cr>
+    nnoremap <silent> y :<c-u>call remembrall#remind('n', 'y')<cr>
+
+    augroup remembrall
+        autocmd FileType tex nnoremap <buffer> <silent> <nowait> <expr> ,l Remembrall(',l')
+    augroup END
+endif
 
 " Ultisnips
 nnoremap cps :UltiSnipsEdit<cr>
@@ -210,14 +220,6 @@ let g:localvimrc_whitelist='/home/*'
 " NerdTree
 let g:NERDTreeHijackNetrw = 0
 
-" Remembrall
-nnoremap <silent> ,, :call remembrall#remind('n', '')<cr>
-nnoremap <silent> y :<c-u>call remembrall#remind('n', 'y')<cr>
-
-augroup remembrall
-    autocmd FileType tex nnoremap <buffer> <silent> <nowait> <expr> ,l Remembrall(',l')
-augroup END
-
 " Ultisnips
 let g:UltiSnipsEditSplit="horizontal"
 let g:UltiSnipsExpandTrigger="<tab>"
@@ -371,7 +373,7 @@ nnoremap <silent> >B :BufSurfForward<cr>:bd! #<cr>
 
 " Alternate file
 nnoremap <bs> 
-nnoremap <tab> 
+nnoremap <tab> :Buffers<cr>
 
 " Source current file
 nnoremap ,s :source %<cr>