summaryrefslogtreecommitdiff
path: root/.vimrc
diff options
context:
space:
mode:
Diffstat (limited to '.vimrc')
-rw-r--r--.vimrc57
1 files changed, 43 insertions, 14 deletions
diff --git a/.vimrc b/.vimrc
index 46999b1..87bb5bb 100644
--- a/.vimrc
+++ b/.vimrc
@@ -6,7 +6,6 @@ call vundle#begin()
Bundle 'gmarik/Vundle.vim'
Bundle 'ervandew/supertab'
Bundle 'airblade/vim-gitgutter'
-Bundle 'ctrlpvim/ctrlp.vim'
Bundle 'scrooloose/syntastic'
Bundle 'tpope/vim-fugitive'
Bundle 'tpope/vim-surround'
@@ -23,12 +22,15 @@ Bundle 'christoomey/vim-tmux-navigator'
Bundle 'nicholaides/words-to-avoid.vim'
Bundle 'reedes/vim-wordy'
Bundle 'vim-scripts/vim-auto-save'
-Bundle 'vim-scripts/utl.vim'
Bundle 'tmhedberg/SimpylFold'
Bundle 'nvie/vim-flake8'
Bundle 'majutsushi/tagbar'
Bundle 'francoiscabrol/ranger.vim'
-Bundle 'rbgrouleff/bclose.vim'
+Bundle 'junegunn/fzf'
+Bundle 'junegunn/fzf.vim'
+Bundle 'chengzeyi/fzf-preview.vim'
+Bundle 'alok/notational-fzf-vim'
+Bundle 'junegunn/limelight.vim'
call vundle#end()
filetype plugin indent on
"}}}
@@ -72,12 +74,10 @@ let @c ='icheers Scott Gilbertson sng@luxagraf.net '
let @w ='icheers Scott Gilbertson scott_gilbertson@condenast.com'
let @t ='iThank you for your help. '
-let @m ='iScott Gilbertson 1720 Epps Bridge Pkwy Ste 108 #139 Athens, GA, 30606 (706) 438-4297 '
let @h ="iHello, my name is Scott Gilbertson and and I am a product writer with WIRED's Gear team. I am reaching out because we're working on an article about "
let @b ='tag=w050b-20'
let @n ='tag=wirednl-20'
let @d ='<div class="cluster"> <span class="row-2"> </span> </div>'
-
" get rid of line breaks in paragraphs
let @p ='g/^./ .,/^$/-1 join'
" }}}
@@ -105,13 +105,14 @@ map <silent> <C-U> ]s
map <silent> <C-I> z=
"quicker way to get to the thesaurus:
inoremap ;t <c-x><c-t>
-
+nnoremap ;m :%s/ $//<cr>
"Let's just leave the whole w out of it shall we.
noremap <C-h> <C-w>h
noremap <C-j> <C-w>j
noremap <C-k> <C-w>k
noremap <C-l> <C-w>l
+nmap <leader>n :NV!<cr>
" Convert curly quotes to straight. {{{
" Any argument causes substitute to confirm changes.
function! ToStraight(line1, line2, args)
@@ -278,7 +279,7 @@ set thesaurus+=/home/lxf/.mthesaur.txt
" NValt style searching with Ack to quicklist
command! -nargs=1 Nvs :Ack -i -n "<args>" $NOTES_DIR
command! -nargs=1 Ngrep vimgrep "<args>" $NOTES_DIR/*.txt|:cw
-noremap <leader>n :Ngrep
+"noremap <leader>n :Ngrep
noremap <leader>v :Nvs
" }}}
" Filetype stuff {{{
@@ -377,19 +378,34 @@ noremap zE <Nop>
" }}}
" Plugins {{{
"Ctrl P {{{
-nnoremap <leader>r :CtrlPMRU<cr>
-nnoremap <leader>m :CtrlPBuffer<cr>
-nnoremap <leader>. :CtrlP<cr>
-nnoremap <leader>w :CtrlP ~/writing/wired/<cr>
-nnoremap <leader>a :CtrlP app/<cr>
-nnoremap <leader>d :CtrlP $HOME/notes/<cr>
-nnoremap <leader>l :CtrlP $HOME/writing/luxagraf/<cr>
+"nnoremap <leader>r :CtrlPMRU<cr>
+"nnoremap <leader>m :CtrlPBuffer<cr>
+"nnoremap <leader>. :CtrlP<cr>
+"nnoremap <leader>w :CtrlP ~/writing/wired/<cr>
+"nnoremap <leader>a :CtrlP app/<cr>
+"nnoremap <leader>d :CtrlP $HOME/notes/<cr>
+"nnoremap <leader>l :CtrlP $HOME/writing/luxagraf/<cr>
let g:ctrlp_custom_ignore = {
\ 'dir': '\v[\/]\.(git|hg|svn|venv|site|static)$',
\ 'file': '\v\.(pyc|so|dll)$',
\ }
"}}}
+"FZF {{{
+let g:fzf_preview_window='right:60%'
+nnoremap <leader>. :FZF<cr>
+nnoremap <leader>r :History<cr>
+nnoremap <leader>w :FZF ~/writing/conde/wired/<cr>
+nnoremap <leader>a :FZF app/<cr>
+nnoremap <leader>l :FZF ~/writing/luxagraf/<cr>
+nnoremap <leader>g :BLines<cr>
+"}}}
+" FZF Notational Velocity plugin {{{
+let g:nv_search_paths = ['~/notes', '~/writing/luxagraf/', '~/documents/bookmarks/']
+"}}}
"
+" SimpylFold Python folding plugin {{{
+let g:SimpylFold_docstring_preview = 0
+"}}}
" make YCM compatible with UltiSnips (using supertab)
let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
@@ -399,6 +415,19 @@ let g:SuperTabDefaultCompletionType = '<C-n>'
" let g:UltiSnipsExpandTrigger = "<tab>"
" let g:UltiSnipsJumpForwardTrigger = "<tab>"
" let g:UltiSnipsJumpBackwardTrigger = "<s-tab>"
+"
+" goyo / limelight
+
+" Color name (:help cterm-colors) or ANSI code
+let g:limelight_conceal_ctermfg = 'gray'
+let g:limelight_conceal_ctermfg = 240
+"
+" " Color name (:help gui-colors) or RGB color
+let g:limelight_conceal_guifg = 'DarkGray'
+let g:limelight_conceal_guifg = '#777777'
+"
+" " Default: 0.5
+let g:limelight_default_coefficient = 0.5
nnoremap <silent> <c-s> :NV<CR>
let g:markdown_fold_style = 'nested'