diff --git a/.gitmodules b/.gitmodules index 53a82add..493cc9e5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -279,3 +279,6 @@ [submodule "vim/bundle/skwp-vim-powerline"] path = vim/bundle/skwp-vim-powerline url = https://github.com/skwp/vim-powerline +[submodule "vim/bundle/kana-vim-arpeggio"] + path = vim/bundle/kana-vim-arpeggio + url = https://github.com/kana/vim-arpeggio diff --git a/README.md b/README.md index 5323f91d..48e78d41 100644 --- a/README.md +++ b/README.md @@ -326,6 +326,7 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke * `,.` to go to last edit location instead of `'.` because the apostrophe is hard on the pinky * `Cmd-'` and `Cmd-"` to change content inside quotes * Cmd-Space to autocomplete. Tab for snipmate snippets. + * `fd` and `jk` key *chords* - hit the first two homerow buttons simultaneously on either side of the keyboard to go to beginning and end of line #### Tab Navigation @@ -444,6 +445,7 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke #### General enhancements that don't add new commands + * Arpeggio - allows you to define key-chord combinations * IndexedSearch - when you do searches will show you "Match 2 of 4" in the status line * delimitMate - automatically closes quotes * syntastic - automatic syntax checking when you save the file diff --git a/vim/bundle/kana-vim-arpeggio b/vim/bundle/kana-vim-arpeggio new file mode 160000 index 00000000..c0a4929c --- /dev/null +++ b/vim/bundle/kana-vim-arpeggio @@ -0,0 +1 @@ +Subproject commit c0a4929c940e4fb32f8aaa70440da113c7064467 diff --git a/vim/plugin/settings/yadr-keymap.vim b/vim/plugin/settings/yadr-keymap.vim index 151f0c79..c3fe175a 100644 --- a/vim/plugin/settings/yadr-keymap.vim +++ b/vim/plugin/settings/yadr-keymap.vim @@ -1,3 +1,6 @@ +" Arpeggio lets us define key-chord combos (simultaneous key presses) +call arpeggio#load() + " ======================================== " General vim sanity improvements " ======================================== @@ -35,6 +38,11 @@ imap _ imap - imap - +" Use the two first fingers on both sides of the keyboard +" simultaneously to go to the beginning or end of line +Arpeggio nnoremap jk $ +Arpeggio nnoremap fd 0 + " Change inside quotes with Cmd-" and Cmd-' nnoremap ci' nnoremap ci"