commit 35b786e4e76ac3ace1d0c88c57138ebbfbb79a44
parent 71fbd3ff3757fe0aa2ef8f29df57016277c12c03
Author: Anders Damsgaard <andersd@riseup.net>
Date: Tue, 27 Mar 2018 11:11:31 -0400
Add sneak and remove yankstack which caused conflicts
Diffstat:
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/links/.vim/plugin/keybinds.vim b/links/.vim/plugin/keybinds.vim
@@ -129,18 +129,6 @@ inoremap lkj <Esc>:write<CR>
"nnoremap j gj
"nnoremap k gk
-" easymotion bindings
-let g:EasyMotion_smartcase = 1 " case-insensitive
-let g:EasyMotion_do_mapping = 0 " disable default bindings
-
-nmap <leader>E <Plug>(easymotion-prefix)
-nmap <leader>j <Plug>(easymotion-j)
-nmap <leader>k <Plug>(easymotion-k)
-
-" <Leader><Leader>{char}{char} to move to {char}{char}
-nmap <leader><leader> <Plug>(easymotion-overwin-f2)
-nmap \ <Plug>(easymotion-overwin-f2)
-
" Disable arrow keys
noremap <Left> <Nop>
noremap <Right> <Nop>
@@ -184,9 +172,6 @@ nnoremap <Leader>V "+P
xnoremap <Leader>v "+p
xnoremap <Leader>V "+P
-nmap <leader>p <Plug>yankstack_substitute_older_paste
-nmap <leader>P <Plug>yankstack_substitute_newer_paste
-
" align things into columns interactively
xnoremap <silent> <Enter> :EasyAlign<cr>
diff --git a/links/.vim/plugins.vim b/links/.vim/plugins.vim
@@ -2,19 +2,17 @@
call plug#begin('~/.vim/vim-plugs') " Specify a directory for plugins
-"""""" Misc """"""
+""""" Misc """"""
Plug 'tpope/vim-unimpaired' " nav. errors with ]q, newlines with ]spc
-Plug 'johngrib/vim-game-code-break' " :VimGameCodeBreak
-Plug 'johngrib/vim-game-snake' " :VimGameSnake
Plug 'junegunn/vim-emoji' " autocomplete :smiley: with C-x C-u
Plug 'chrisbra/unicode.vim' " autocomplete unicode with C-x C-z
+Plug 'tpope/vim-characterize' " complete info of char under cursor with ga
-"""""" Appearance """"""
+""""" Appearance """"""
Plug 'drzel/vim-line-no-indicator' " show current line with single character
Plug 'jacoborus/tender' " color scheme
Plug 'luochen1990/rainbow' " colorcode paranthesis pairs
Plug 'mhinz/vim-startify' " startup screen
-Plug 'guns/xterm-color-table.vim' " show color table with :XtermColorTable
Plug 'embear/vim-foldsearch' " hide/show lines matching a pattern
Plug 'junegunn/goyo.vim' " distraction-free editing in prose mode
Plug 'junegunn/limelight.vim' " highlight current paragraph in goyo
@@ -25,29 +23,27 @@ Plug 'vim-scripts/AnsiEsc.vim' " show ANSI colors with :AnsiEsc
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'junegunn/fzf.vim' " fzf commands from within vim
Plug 'ludovicchabant/vim-gutentags' " automatic tag generation
+Plug 'tpope/vim-eunuch' " :SudoWrite, :Rename, :Move, etc
"""""" Syntax checking """"""
Plug 'w0rp/ale' " asynchronous syntax check
Plug 'lukhio/adVIMsor', { 'on': 'AdVIMsorEnable' } " checks with :AdVIMsor*
"""""" Buffer motion """"""
-Plug 'easymotion/vim-easymotion' " jump to char with <spc><spc>char
Plug 'christoomey/vim-tmux-navigator' " seamless tmux pane/vim window navigation
Plug 'junegunn/vim-slash' " clear highlight when moving cursor
+Plug 'justinmk/vim-sneak' " move cursor s{char}{char}, S{char}{char}
"""""" Text editing """"""
Plug 'tpope/vim-surround' " modify surrounding symbols
Plug 'tpope/vim-repeat' " repeat plugin bindings with .
+Plug 'tpope/vim-commentary' " comment line with gcc, motion with gc
Plug 'junegunn/vim-easy-align' " align in columns (select > return > space)
Plug 'reedes/vim-litecorrect' " autocorrect common typos
Plug 'reedes/vim-pencil' " used for line wrapping in mails
Plug 'szw/vim-dict' " query dict.org using :Dict
Plug 'junegunn/vim-online-thesaurus' " query with :OnlineThesaurusCurrentWord
-" cycle through yank history with <leader>p and <leader>P after pasting,
-" see history with :Yanks
-Plug 'maxbrunsfeld/vim-yankstack'
-
"""""" Autocomplete """"""
Plug 'honza/vim-snippets' " snippets are separate from ultisnips
Plug 'SirVer/ultisnips' " complete boilerplate code
@@ -60,6 +56,7 @@ Plug 'airblade/vim-gitgutter' " show line changes since last git commit
"""""" Processes """"""
Plug 'tpope/vim-dispatch' " for asynchronous :Make
+
"""""" File types """"""
" Go
@@ -103,6 +100,8 @@ let g:gitgutter_map_keys = 0
let g:go_version_warning = 0
+let g:sneak#label = 1
+
" better key bindings for UltiSnipsExpandTrigger
let g:UltiSnipsExpandTrigger = "<tab>"
let g:UltiSnipsJumpForwardTrigger = "<tab>"
