wrapped up all the updates into one commit

1 files changed, 15 insertions, 2 deletions

diff --git a/.vimrc b/.vimrc
index 00147f8..011cb86 100644
--- a/.vimrc
+++ b/.vimrc
@@ -29,6 +29,8 @@ Bundle 'alok/notational-fzf-vim'
 Bundle 'nathangrigg/vim-beancount'
 Bundle 'lambdalisue/suda.vim'
 Bundle 'jasonccox/vim-wayland-clipboard'
+Bundle 'fcpg/vim-waikiki'
+Bundle 'tyru/open-browser.vim'
 call vundle#end()
 filetype plugin indent on
 "}}}
@@ -54,20 +56,24 @@ set showcmd
 set showmode
 set backspace=indent,eol,start
 let mapleader = ","
-
+let maplocalleader = "."
 "save things when we turn our back
 autocmd BufLeave,FocusLost * silent! wall
 " save things all the time:
 
 let g:auto_save = 1
 let g:auto_save_in_insert_mode = 0
+let g:netrw_nogx = 1 " disable netrw's gx mapping.
+nmap gx <Plug>(openbrowser-smart-search)
+vmap gx <Plug>(openbrowser-smart-search)
 "}}}
 
 " Abbreviations {{{
 
 " easier markdown links:
 let @a ='Sr%a()h'
-let @s ='Sr%a(){: rel=nofollow}17h'
+let @s ='Sr%a(){: rel=nofollow isAffiliateLink="true"}40h'
+
 " email signature:
 let @c ='icheers 
Scott Gilbertson 
sng@luxagraf.net '
 let @w ='i

cheers 
Scott Gilbertson
--
<wired@scottgilbertson.net>
<scott_gilbertson@wired.com>
<https://www.wired.com/author/scott-gilbertson/>'
@@ -80,6 +86,7 @@ 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'
+let @v='/a bit|a little|sort of|kind of|rather|quite|very|too|pretty much'
 " }}}
 " Convenience mappings {{{
 
@@ -424,3 +431,9 @@ nmap <leader># :%s/### /###/g
 
 imap jj <Esc>
 vmap <silent> <leader>r <esc>:'<,'>:w !espeak &> /dev/null <CR>
+"let g:waikiki_default_maps = 1
+let g:waikiki_wiki_roots = ['~/notes'] 
+let g:waikiki_ext ='.txt'
+let g:waikiki_index = "index.txt"
+nnoremap <Leader>b :bp<CR>
+nmap <leader><cr> <Plug>(waikikiFollowLink)