Update vim config

11 files changed, 64 insertions, 13 deletions

diff --git a/.gitmodules b/.gitmodules
index a3eb48a..1f6be06 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,21 @@
 [submodule ".vim/pack/submodule/start/vim-javascript"]
 	path = .vim/pack/submodule/start/vim-javascript
 	url = https://github.com/pangloss/vim-javascript
+[submodule ".vim/pack/submodule/start/vim-terraform"]
+	path = .vim/pack/submodule/start/vim-terraform
+	url = https://github.com/hashivim/vim-terraform
+[submodule ".vim/pack/submodule/start/vim-cool"]
+	path = .vim/pack/submodule/start/vim-cool
+	url = https://github.com/romainl/vim-cool
+[submodule ".vim/pack/submodule/start/vim-grammarous"]
+	path = .vim/pack/submodule/start/vim-grammarous
+	url = https://github.com/rhysd/vim-grammarous.git
+[submodule ".vim/pack/submodule/start/context.vim"]
+	path = .vim/pack/submodule/start/context.vim
+	url = https://github.com/wellle/context.vim
+[submodule ".vim/pack/submodule/start/vim-highlightedyank"]
+	path = .vim/pack/submodule/start/vim-highlightedyank
+	url = https://github.com/machakann/vim-highlightedyank
+[submodule ".vim/pack/submodule/start/vim9-stargate"]
+	path = .vim/pack/submodule/start/vim9-stargate
+	url = https://github.com/monkoose/vim9-stargate
diff --git a/.vim/after/plugin/easymotion.vim b/.vim/after/plugin/easymotion.vim
index 5b243c5..440df48 100644
--- a/.vim/after/plugin/easymotion.vim
+++ b/.vim/after/plugin/easymotion.vim
@@ -21,18 +21,6 @@ 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)
diff --git a/.vim/after/plugin/vim-highlightedyank.vim b/.vim/after/plugin/vim-highlightedyank.vim
new file mode 100644
index 0000000..ee3e896
--- /dev/null
+++ b/.vim/after/plugin/vim-highlightedyank.vim
@@ -0,0 +1 @@
+let g:highlightedyank_highlight_duration = 100
diff --git a/.vim/after/plugin/vim9-stargate.vim b/.vim/after/plugin/vim9-stargate.vim
new file mode 100644
index 0000000..d6f9075
--- /dev/null
+++ b/.vim/after/plugin/vim9-stargate.vim
@@ -0,0 +1,9 @@
+" For 1 character to search before showing hints
+noremap <space>f <Cmd>call stargate#OKvim(1)<CR>
+" For 2 consecutive characters to search
+noremap <space>s <Cmd>call stargate#OKvim(2)<CR>
+
+" for the 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>
diff --git a/.vim/pack/submodule/start/context.vim b/.vim/pack/submodule/start/context.vim
new file mode 160000
+Subproject 108644e146c864995288dee7dacf219267917ac
diff --git a/.vim/pack/submodule/start/vim-cool b/.vim/pack/submodule/start/vim-cool
new file mode 160000
+Subproject 662e7b11064cbeedad17c45d2fe926e78d3cd0b
diff --git a/.vim/pack/submodule/start/vim-grammarous b/.vim/pack/submodule/start/vim-grammarous
new file mode 160000
+Subproject db46357465ce587d5325e816235b5e92415f8c0
diff --git a/.vim/pack/submodule/start/vim-highlightedyank b/.vim/pack/submodule/start/vim-highlightedyank
new file mode 160000
+Subproject fa3f57b097e9521ce41a66b6c7cf5d9adea70ea
diff --git a/.vim/pack/submodule/start/vim-terraform b/.vim/pack/submodule/start/vim-terraform
new file mode 160000
+Subproject d37ae7e7828aa167877e338dea5d4e1653ed3eb
diff --git a/.vim/pack/submodule/start/vim9-stargate b/.vim/pack/submodule/start/vim9-stargate
new file mode 160000
+Subproject 2df5dad08e74dedb020e042e66f8f4819a48b6c
diff --git a/README.md b/README.md
index 9ffc64b..ce69f52 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,42 @@ Dotfiles of gx. Don't use it unless you're gx.
 
 ## Vim
 
-Packages included:
+Packages included is listed below.
+
+Coding:
+
+- [vim9-stargate](https://github.com/monkoose/vim9-stargate): modern
+  alternative to easymotion.
+
+Languages specfic:
 
 - [vim-javascript](https://github.com/pangloss/vim-javascript):
   Improve javascript syntax highlight.
+- [vim-terraform](https://github.com/hashivim/vim-terraform):
+  Improve terraform syntax highlight.
+
+Writing:
+
+- [vim-grammarous](https://github.com/rhysd/vim-grammarous): use
+  LanguageTool to check grammar.
+
+Misc:
+
+- [vim-cool](https://github.com/romainl/vim-cool): improve hlsearch.
+- [context.vim](https://github.com/wellle/context.vim): automatically
+  folding when reading long code.
+- [vim-highlightedyank](https://github.com/machakann/vim-highlightedyank):
+  highlight yanked text.
+
+Good but not included yet:
+
+- [emmet-vim](https://github.com/mattn/emmet-vim): help edit html.
+- [quickr-preview.vim](https://github.com/ronakg/quickr-preview.vim): to
+  preview the result in quickfix.
+- [neomake](https://github.com/neomake/neomake): asynchronous linting
+  and make framework.
+- [vim-autoformat](https://github.com/vim-autoformat/vim-autoformat)
+- [quick-scope](https://github.com/unblevable/quick-scope): improve f,F.
+- [any-jump.vim](https://github.com/pechorin/any-jump.vim): use popup
+  window to preview the definition and usage.
+- [vim-signature](https://github.com/kshenoy/vim-signature): show marks.