about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2016-12-06T15·04-0500
committerWilliam Carroll <wpcarro@gmail.com>2016-12-06T15·04-0500
commitc7c71da568816751bcec9cb31b875755e9007725 (patch)
treed2a9615eebeacc90c88155dfd8d009ae3cafc66a
parentac698b564cc18bf8e9333906bd2d66591445fe1e (diff)
Adds new keybindings
-rw-r--r--configs/.vimrc47
1 files changed, 31 insertions, 16 deletions
diff --git a/configs/.vimrc b/configs/.vimrc
index 1b5a307717c2..3cabc22cf960 100644
--- a/configs/.vimrc
+++ b/configs/.vimrc
@@ -60,6 +60,9 @@ Plugin 'vim-airline/vim-airline-themes'
 " Visually align assignments
 Plugin 'godlygeek/tabular'
 
+" Visually Highlight and comment code.
+Plugin 'tpope/vim-commentary'
+
 
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -139,7 +142,9 @@ set mouse=a
 " Highlights matches during a search.
 set hlsearch
 
-nnoremap <leader>/ :set hlsearch!<CR>
+" Search for gibberish to clear the most recent search
+" nnoremap <leader>/ :set hlsearch!<CR>
+noremap <leader>/ /__wc_gibberish__<CR>
 
 
 " Use custom-made snippets.
@@ -191,8 +196,22 @@ nnoremap <leader>l <C-w>l
 nnoremap <leader>q :bdelete<CR>
 
 
-" Fuzzy-find open buffer via CtrlP
-nnoremap <leader>bg :CtrlPBuffer<CR>
+" CtrlP config
+" Set default CtrlP command.
+let g:ctrlp_cmd = 'CtrlP'
+" let g:ctrlp_cmd = 'CtrlPMRU'
+
+" Set runtime path
+set runtimepath^=~/.vim/bundle/ctrlp.vim
+
+" Fuzzy-find files.
+nnoremap <leader>pf :CtrlP<CR>
+
+" Fuzzy-find open buffers.
+nnoremap <leader>pb :CtrlPBuffer<CR>
+
+" Fuzzy-find open buffers.
+nnoremap <leader>pm :CtrlPMRUFiles<CR>
 
 
 " Buffer creation and management
@@ -320,6 +339,11 @@ set t_Co=255
 highlight Comment cterm=italic
 
 
+" Repeat last colon-command
+nnoremap ;; @:<CR>
+vnoremap ;; @:<CR>
+
+
 " Define highlighting groups
 " NOTE: The ANSII aliases for colors will change when iTerm2 settings are
 " changed.
@@ -329,6 +353,7 @@ highlight InterestingWord2 ctermbg=Blue ctermfg=Black
 " h1 highlighting
 nnoremap <silent> <leader>1 :execute '2match InterestingWord1 /\<<c-r><c-w>\>/'<CR>
 nnoremap <silent> <leader>x1 :execute '2match none'<CR>
+vnoremap <silent> <leader>1 :execute '2match InterestingWord1 /\<<c-r><c-w>\>/'<CR>
 
 " h2 highlighting
 nnoremap <silent> <leader>2 :execute '3match InterestingWord2 /\<<c-r><c-w>\>/'<CR>
@@ -385,6 +410,8 @@ nnoremap <leader>v5 :resize 25<CR>
 nnoremap <leader>v6 :resize 30<CR>
 nnoremap <leader>v7 :resize 35<CR>
 nnoremap <leader>v8 :resize 40<CR>
+nnoremap <leader>v9 :resize 45<CR>
+nnoremap <leader>v0 :resize 50<CR>
 
 
 " NERDTree settings
@@ -411,7 +438,7 @@ vnoremap L $
 
 
 " Search for visually selected text
-vnoremap // y/<C-r>"<CR>
+vnoremap // y/<C-r>"<CR>N
 
 
 " trim trailing whitespace on save
@@ -422,18 +449,6 @@ autocmd BufWritePre *.{js,py,tpl,less,html,ex} :%s/\s\+$//e
 set guifont=Operator\ Mono:h16
 
 
-" CtrlP Config.
-set runtimepath^=~/.vim/bundle/ctrlp.vim
-" let g:ctrlp_map = '<c-p>'
-let g:ctrlp_cmd = 'CtrlP'
-
-" Maps CtrlP to leader to future-proof config.
-nnoremap <leader>p :CtrlP<CR>
-
-" Fuzzy-finds files within cwd.
-" nnoremap <leader>pf :CtrlP<CR>
-
-
 " Use .gitignore file to populate Ctrl-P
 let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . -co --exclude-standard', 'find %s -type f']