summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2014-09-07 02:36:41 -0400
committerJesse Luehrs <doy@tozt.net>2014-09-14 11:59:57 -0400
commitb0588883081bd87a2dcd4c04a8eb3cf005cb6f2f (patch)
tree704c3cfa0f7149bb48edb307e250e225a839789a
parentb72f53b2805338c68e9f9eaa0fb444469ea6cf1c (diff)
downloadconf-b0588883081bd87a2dcd4c04a8eb3cf005cb6f2f.tar.gz
conf-b0588883081bd87a2dcd4c04a8eb3cf005cb6f2f.zip
try out easymotion again
-rw-r--r--.gitmodules3
m---------vim/bundle/easymotion0
-rw-r--r--vimrc21
3 files changed, 23 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index fd8535c..2566e5b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -73,3 +73,6 @@
[submodule "vim/bundle/typescript"]
path = vim/bundle/typescript
url = git://github.com/leafgarland/typescript-vim
+[submodule "vim/bundle/easymotion"]
+ path = vim/bundle/easymotion
+ url = https://github.com/Lokaltog/vim-easymotion.git
diff --git a/vim/bundle/easymotion b/vim/bundle/easymotion
new file mode 160000
+Subproject 3b8a2dda5c69612c948017424d621f83e38b51a
diff --git a/vimrc b/vimrc
index 7779892..9ba62aa 100644
--- a/vimrc
+++ b/vimrc
@@ -744,7 +744,6 @@ function! s:unite_my_settings()
autocmd InsertLeave <buffer> call feedkeys("\<Plug>(unite_exit)")
endfunction
nnoremap <silent>t :Unite -silent -profile-name=with_dir buffer file_rec/async<CR>
-nnoremap <silent>f :Unite -silent buffer file<CR>
nnoremap <silent>& :Unite -silent grep:.<CR>
" }}}
" vimfiler {{{
@@ -802,4 +801,24 @@ smap <expr><Tab>
\ "\<Tab>" :
\ neocomplete#start_manual_complete()
" }}}
+" easymotion {{{
+let g:EasyMotion_do_mapping = 0
+let g:EasyMotion_smartcase = 1
+let g:EasyMotion_enter_jump_first = 1
+
+map ff <Plug>(easymotion-fl)
+omap ff <Plug>(easymotion-tl)
+
+map fj <Plug>(easymotion-j)
+map fk <Plug>(easymotion-k)
+map fh <Plug>(easymotion-linebackward)
+map fl <Plug>(easymotion-lineforward)
+
+map f/ <Plug>(easymotion-fn)
+omap f/ <Plug>(easymotion-tn)
+map f? <Plug>(easymotion-Fn)
+omap f? <Plug>(easymotion-Tn)
+map fn <Plug>(easymotion-vim-n)
+map fN <Plug>(easymotion-vim-N)
+" }}}
" }}}