summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.vim11
-rw-r--r--plug-config/easymotion.vim11
-rw-r--r--vim-plug/plugins.vim8
3 files changed, 16 insertions, 14 deletions
diff --git a/init.vim b/init.vim
index 0a725d6c..ed6e209f 100644
--- a/init.vim
+++ b/init.vim
@@ -29,16 +29,15 @@ else
" Plugin Configuration
source $HOME/.config/nvim/keys/which-key.vim
source $HOME/.config/nvim/plug-config/vim-commentary.vim
- " source $HOME/.config/nvim/plug-config/rainbow.vim
source $HOME/.config/nvim/plug-config/rnvimr.vim
source $HOME/.config/nvim/plug-config/better-whitespace.vim
source $HOME/.config/nvim/plug-config/fzf.vim
- source $HOME/.config/nvim/plug-config/sneak.vim
source $HOME/.config/nvim/plug-config/codi.vim
source $HOME/.config/nvim/plug-config/vim-wiki.vim
luafile $HOME/.config/nvim/lua/web-devicons-config.lua
luafile $HOME/.config/nvim/lua/treesitter.lua
source $HOME/.config/nvim/plug-config/coc.vim
+ source $HOME/.config/nvim/plug-config/easymotion.vim
source $HOME/.config/nvim/plug-config/goyo.vim
source $HOME/.config/nvim/plug-config/vim-rooter.vim
source $HOME/.config/nvim/plug-config/start-screen.vim
@@ -46,17 +45,19 @@ else
source $HOME/.config/nvim/plug-config/git-messenger.vim
source $HOME/.config/nvim/plug-config/closetags.vim
source $HOME/.config/nvim/plug-config/floaterm.vim
- " source $HOME/.config/nvim/plug-config/vista.vim
- " source $HOME/.config/nvim/plug-config/xtabline.vim
source $HOME/.config/nvim/plug-config/barbar.vim
source $HOME/.config/nvim/plug-config/far.vim
source $HOME/.config/nvim/plug-config/tagalong.vim
- " source $HOME/.config/nvim/plug-config/illuminate.vim
source $HOME/.config/nvim/plug-config/bracey.vim
source $HOME/.config/nvim/plug-config/asynctask.vim
source $HOME/.config/nvim/plug-config/window-swap.vim
source $HOME/.config/nvim/plug-config/markdown-preview.vim
luafile $HOME/.config/nvim/lua/plug-colorizer.lua
+ " source $HOME/.config/nvim/plug-config/sneak.vim
+ " source $HOME/.config/nvim/plug-config/rainbow.vim
+ " source $HOME/.config/nvim/plug-config/illuminate.vim
+ " source $HOME/.config/nvim/plug-config/vista.vim
+ " source $HOME/.config/nvim/plug-config/xtabline.vim
" source $HOME/.config/nvim/plug-config/vimspector.vim " Uncomment if you want to use Vimspector
" source $HOME/.config/nvim/plug-config/ale.vim
endif
diff --git a/plug-config/easymotion.vim b/plug-config/easymotion.vim
index 2b9e8a3d..9322e363 100644
--- a/plug-config/easymotion.vim
+++ b/plug-config/easymotion.vim
@@ -1,6 +1,7 @@
" let g:EasyMotion_do_mapping = 0 " Disable default mappings
" " Turn on case-insensitive feature
-" let g:EasyMotion_smartcase = 1
+let g:EasyMotion_smartcase = 1
+let g:EasyMotion_verbose = 0
" " JK motions: Line motions
" map <Leader>j <Plug>(easymotion-j)
@@ -15,10 +16,10 @@
" nmap <Leader>f <Plug>(easymotion-overwin-f)
" s{char}{char} to move to {char}{char}
-nmap s <Plug>(easymotion-s2)
+nmap <silent> s <Plug>(easymotion-s2)
+nmap <silent> S <Plug>(easymotion-overwin-f2)
" map n <Plug>(easymotion-next)
" map N <Plug>(easymotion-prev)
-" nmap s <Plug>(easymotion-overwin-f2)
" nmap S <Plug>(easymotion-overwin-t)
" Move to line
@@ -31,9 +32,7 @@ nmap s <Plug>(easymotion-s2)
" hi link EasyMotionTarget ErrorMsg
" hi link EasyMotionShade Comment
-
-" hi link EasyMotionTarget2First MatchParen
-" hi link EasyMotionTarget2Second MatchParen
+let g:EasyMotion_prompt = '🔎 '
" hi link EasyMotionMoveHL Search
" hi link EasyMotionIncSearch Search
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index d56d2613..fcf3c7ad 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -25,7 +25,8 @@ call plug#begin('~/.config/nvim/autoload/plugged')
if exists('g:vscode')
" Easy motion for VSCode
- Plug 'asvetliakov/vim-easymotion'
+ " Plug 'asvetliakov/vim-easymotion'
+ Plug 'ChristianChiarulli/vscode-easymotion'
Plug 'machakann/vim-highlightedyank'
else
@@ -34,7 +35,9 @@ call plug#begin('~/.config/nvim/autoload/plugged')
" Plug 'mfussenegger/nvim-dap'
" Plug 'nvim-dap-virtual-text'
" Sneak
- Plug 'justinmk/vim-sneak'
+ " Plug 'justinmk/vim-sneak'
+ " Easymotion
+ Plug 'easymotion/vim-easymotion'
" Surround
Plug 'tpope/vim-surround'
" Files
@@ -158,7 +161,6 @@ call plug#begin('~/.config/nvim/autoload/plugged')
" Making stuff
" Plug 'neomake/neomake'
" Plug 'mhinz/vim-signify'
- " Plug 'easymotion/vim-easymotion'
" Plug 'preservim/nerdcommenter'
" Plug 'brooth/far.vim'
" Plug 'atishay/far.vim'