1 files changed, 20 insertions, 37 deletions

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 06992d0..2bb1324 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -42,8 +42,11 @@ Plug 'godlygeek/tabular'
 Plug 'dbeniamine/cheat.sh-vim'
 "color code highlight
 Plug 'chrisbra/Colorizer'
+
 "comment helper
-Plug 'scrooloose/nerdcommenter'
+"Plug 'scrooloose/nerdcommenter'
+Plug 'tpope/vim-commentary'
+
 "folding ledger files
 Plug 'ledger/vim-ledger'
 "reporen files at your last edit position
@@ -52,9 +55,14 @@ Plug 'farmergreg/vim-lastplace'
 Plug 'kshenoy/vim-signature'
 "git diff in the sign column
 Plug 'airblade/vim-gitgutter'
+"jump to location by 2 characters
+Plug 'justinmk/vim-sneak'
 
+"splits delete into cut and delete
 Plug 'svermeulen/vim-cutlass'
+"change text with yank
 Plug 'svermeulen/vim-subversive'
+"yank history
 Plug 'svermeulen/vim-yoink'
 
 "enable repeating supported plugin maps with '.'
@@ -69,9 +77,7 @@ Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-speeddating'
 "search, substitute and abbreviate
 Plug 'tpope/vim-abolish'
-"helpers for unix
-Plug 'tpope/vim-eunuch'
-"unicode character metadata
+"provides ga, show unicode stuff of char under cursor
 Plug 'tpope/vim-characterize'
 
 "fancy start screen
@@ -98,18 +104,14 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isT
 "{{{Misc Settings
 
 let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
-
 " necesary  for lots of cool vim things
 set nocompatible
-
 " See below
 " https://stackoverflow.com/a/33380495
 if !exists("g:syntax_on")
     syntax enable
 endif
-
 set grepprg=grep\ -nH\ $* " DONT KNOW WHAT THIS DOES
-
 " Tab stuff
 set autoindent
 set expandtab " Use appropriate number of spaces to insert a <Tab>
@@ -117,16 +119,13 @@ set smarttab
 set shiftwidth=4
 set softtabstop=4
 set tabstop=8
-
 " Use english for spellchecking, but don't spellcheck by default
 set spell spelllang=en_us
 set nospell
-
 " Cool tab completion stuff
 set wildmenu
 set wildmode=list:longest,full
 set wildignore=*.o,*.obj,*.class
-
 set encoding=utf-8
 set scrolloff=4 " Keep n lines above/below cursor
 set mouse=c
@@ -143,19 +142,12 @@ set showmatch " jump to the matching bracket briefly, REMOVE AFTER TESTING
 set linebreak " wrap using 'breakat' character
 set splitbelow " new split panes will split to below and right
 set splitright
-
 " persistent undo
 set undodir=~/.vim/undodir
 set undofile
-
 " lower case searches ignore case, upper case searches do not
 set ignorecase
 set smartcase
-
-" This is totally awesome - remap jj to escape in insert mode.  You'll never type jj anyway, so it's great!
-inoremap jj <Esc>
-nnoremap JJJJ <Nop>
-
 " https://stackoverflow.com/a/3445040/
 " switch case labels
 set cinoptions=l1
@@ -216,60 +208,47 @@ endfunction
 
 " Open Url on this line with the browser \w
 map <Leader>w :call Browser ()<CR>
-
 " Open the TagBar Plugin <F3>
 nnoremap <silent> <F3> :TagbarToggle<CR>
-
 " Open NERDTree <F4>
 nnoremap <silent> <F4> :NERDTreeToggle<CR>
-
 " Next Tab
 nnoremap <silent> <C-Right> :tabnext<CR>
-
 " Previous Tab
 nnoremap <silent> <C-Left> :tabprevious<CR>
-
 " New Tab
 nnoremap <silent> <C-t> :tabnew<CR>
-
 " Rotate Color Scheme <F8>
 "nnoremap <silent> <F8> :execute RotateColorTheme()<CR>
-
 " FixIt from YCM
 map <F9> :YcmCompleter FixIt<CR>
-
 " Edit vimrc \ev
 nnoremap <silent> <Leader>ev :tabnew<CR>:e ~/.config/nvim/init.vim<CR>
-
 " Up and down are more logical with g..
 nnoremap <silent> k gk
 nnoremap <silent> j gj
 inoremap <silent> <Up> <Esc>gka
 inoremap <silent> <Down> <Esc>gja
-
+" This is totally awesome - remap jj to escape in insert mode.  You'll never type jj anyway, so it's great!
+inoremap jj <Esc>
+nnoremap JJJJ <Nop>
 " quicker window movement
 nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
 nnoremap <C-h> <C-w>h
 nnoremap <C-l> <C-w>l
-
 " Disable highlight when <leader><cr> is pressed
 map <silent> <leader><cr> :noh<cr>
-
 " Space will toggle folds!
 nnoremap <space> za
-
 " Search mappings: These will make it so that going to the next one in a
 " search will center on the line it's found in.
 map N Nzz
 map n nzz
-
 "Insert timestamp
 nnoremap <F5> "=strftime("%F %T")<CR>P
 inoremap <F5> <C-R>=strftime("%F %T")<CR>
-
 nnoremap <Leader>t "=strftime("%F")<CR>P
-
 "}}}
 
 "{{{Tagbar
@@ -399,14 +378,18 @@ map <Leader>b <Plug>VimwikiToggleListItem
 set clipboard=unnamed,unnamedplus
 
 " s for substitute
-nmap s <plug>(SubversiveSubstitute)
-nmap ss <plug>(SubversiveSubstituteLine)
-nmap S <plug>(SubversiveSubstituteToEndOfLine)
+nmap <leader>ys <plug>(SubversiveSubstitute)
+nmap <leader>yss <plug>(SubversiveSubstituteLine)
+nmap <leader>yS <plug>(SubversiveSubstituteToEndOfLine)
 
 nmap <leader>s <plug>(SubversiveSubstituteRange)
 xmap <leader>s <plug>(SubversiveSubstituteRange)
 nmap <leader>ss <plug>(SubversiveSubstituteWordRange)
 
+nmap <leader><leader>s <plug>(SubversiveSubvertRange)
+xmap <leader><leader>s <plug>(SubversiveSubvertRange)
+nmap <leader><leader>ss <plug>(SubversiveSubvertWordRange)
+
 nmap <c-n> <plug>(YoinkPostPasteSwapBack)
 nmap <c-p> <plug>(YoinkPostPasteSwapForward)