Use vim easymotion again

3 files changed, 41 insertions, 69 deletions

diff --git a/.vim/after/plugin/easymotion.vim b/.vim/after/plugin/easymotion.vim
index cd50666..5b243c5 100644
--- a/.vim/after/plugin/easymotion.vim
+++ b/.vim/after/plugin/easymotion.vim
@@ -1,38 +1,40 @@
-" let g:EasyMotion_do_mapping = 0
-" let g:EasyMotion_smartcase = 1
-" let g:EasyMotion_smartsign_us = 1
-" " let g:EasyMotion_startofline = 0
-" 
-" map <space>j <Plug>(easymotion-j)
-" nmap <space>j <Plug>(easymotion-j)
-" 
-" map <space>k <Plug>(easymotion-k)
-" nmap <space>k <Plug>(easymotion-k)
-" 
-" map <space>l <Plug>(easymotion-lineforward)
-" nmap <space>l <Plug>(easymotion-lineforward)
-" 
-" map <space>h <Plug>(easymotion-linebackward)
-" nmap <space>h <Plug>(easymotion-linebackward)
-" 
-" map <space><space> <Plug>(easymotion-bd-jk)
-" nmap <space><space> <Plug>(easymotion-overwin-line)
-" 
-" map <space>n <Plug>(easymotion-bd-n)
-" nmap <space>n <Plug>(easymotion-bd-n)
-" 
-" map <space>w <Plug>(easymotion-bd-w)
-" nmap <space>w <Plug>(easymotion-overwin-w)
-" 
-" map <space>e <Plug>(easymotion-bd-e)
-" nmap <space>e <Plug>(easymotion-bd-e)
-" 
-" map <space>f <Plug>(easymotion-bd-f)
-" nmap <space>f <Plug>(easymotion-overwin-f)
-" 
-" map <space>s <Plug>(easymotion-bd-f2)
-" nmap <space>s <Plug>(easymotion-overwin-f2)
-" 
-" nmap <space>/ <Plug>(easymotion-bd-fn)
-" 
-" nmap <space>; <Plug>(easymotion-repeat)
+let g:EasyMotion_do_mapping = 0
+let g:EasyMotion_smartcase = 1
+let g:EasyMotion_smartsign_us = 1
+" let g:EasyMotion_startofline = 0
+
+map <space>j <Plug>(easymotion-j)
+nmap <space>j <Plug>(easymotion-j)
+
+map <space>k <Plug>(easymotion-k)
+nmap <space>k <Plug>(easymotion-k)
+
+map <space>l <Plug>(easymotion-lineforward)
+nmap <space>l <Plug>(easymotion-lineforward)
+
+map <space>h <Plug>(easymotion-linebackward)
+nmap <space>h <Plug>(easymotion-linebackward)
+
+map <space><space> <Plug>(easymotion-bd-jk)
+nmap <space><space> <Plug>(easymotion-overwin-line)
+
+map <space>n <Plug>(easymotion-bd-n)
+nmap <space>n <Plug>(easymotion-bd-n)
+
+map <space>w <Plug>(easymotion-bd-w)
+nmap <space>w <Plug>(easymotion-overwin-w)
+
+map <space>e <Plug>(easymotion-bd-e)
+nmap <space>e <Plug>(easymotion-bd-e)
+
+map <space>f <Plug>(easymotion-bd-f)
+nmap <space>f <Plug>(easymotion-overwin-f)
+
+map <space>s <Plug>(easymotion-bd-f2)
+nmap <space>s <Plug>(easymotion-overwin-f2)
+
+nmap <space>/ <Plug>(easymotion-bd-fn)
+
+nmap <space>; <Plug>(easymotion-repeat)
+
+packadd vim-easymotion
diff --git a/.vim/after/plugin/minpac.vim b/.vim/after/plugin/minpac.vim
index 0ccfe11..65e429e 100644
--- a/.vim/after/plugin/minpac.vim
+++ b/.vim/after/plugin/minpac.vim
@@ -30,7 +30,6 @@ function! InitMinpac() abort
   call minpac#add('https://github.com/rhysd/vim-lsp-ale.git', {'type': 'opt'})
 
   call minpac#add('https://github.com/andymass/vim-matchup.git', {'type': 'start'})
-  call minpac#add('https://github.com/monkoose/vim9-stargate.git', {'type': 'opt'})
 
   if has('nvim')
     call minpac#add('https://github.com/nvim-lua/plenary.nvim', {'type': 'opt'})
@@ -68,7 +67,7 @@ function! InitMinpac() abort
   call minpac#add('https://github.com/yami-beta/asyncomplete-omni.vim', {'type': 'opt'})
 
   call minpac#add('https://github.com/ludovicchabant/vim-gutentags.git', {'type': 'opt'})
-  " call minpac#add('https://github.com/easymotion/vim-easymotion.git')
+  call minpac#add('https://github.com/easymotion/vim-easymotion.git', {'type': 'opt'})
   call minpac#add('https://github.com/airblade/vim-rooter.git')
   call minpac#add('https://github.com/mbbill/undotree.git')
   call minpac#add('https://github.com/godlygeek/tabular.git')
diff --git a/.vim/after/plugin/stargate.vim b/.vim/after/plugin/stargate.vim
deleted file mode 100644
index 51444a5..0000000
--- a/.vim/after/plugin/stargate.vim
+++ /dev/null
@@ -1,29 +0,0 @@
-if has('nvim') | finish | endif
-
-let g:stargate_name = 'Master'
-
-packadd vim9-stargate
-
-" search two characters
-noremap <space>f <Cmd>call stargate#OKvim(2)<CR>
-
-" start of a word
-noremap <space>w <Cmd>call stargate#OKvim('\<')<CR>
-
-" for the end of a word
-noremap <space>e <Cmd>call stargate#OKvim('\S\>')<CR>
-
-" for the start of a line
-noremap <space>l <Cmd>call stargate#OKvim('\_^')<CR>
-
-" for the last character on the line
-noremap <space>E <Cmd>call stargate#OKvim('\S\s*$')<CR>
-
-" for the end of a line
-noremap <space>$ <Cmd>call stargate#OKvim('$')<CR>
-
-" for any bracket, parentheses or curly bracket
-noremap <space>[ <Cmd>call stargate#OKvim('[(){}[\]]')<CR>
-
-" switch window
-nnoremap <space>W <Cmd>call stargate#Galaxy()<CR>