aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--init.lua1
m---------pack/all/start/vim-under-the-cursor0
-rw-r--r--plugin/max-find-bash.vim2
-rw-r--r--plugin/max-highlight-word-under-cursor.vim26
-rw-r--r--plugin/youcompleteme.vim2
-rw-r--r--vimrc-common8
7 files changed, 10 insertions, 32 deletions
diff --git a/.gitmodules b/.gitmodules
index 92552d3..b939c33 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,3 +76,6 @@
76[submodule "pack/nvim/start/nvim-lsp"] 76[submodule "pack/nvim/start/nvim-lsp"]
77 path = pack/nvim/start/nvim-lsp 77 path = pack/nvim/start/nvim-lsp
78 url = https://github.com/prabirshrestha/vim-lsp 78 url = https://github.com/prabirshrestha/vim-lsp
79[submodule "pack/all/start/vim-under-the-cursor"]
80 path = pack/all/start/vim-under-the-cursor
81 url = https://github.com/coderonline/vim-under-the-cursor
diff --git a/init.lua b/init.lua
index c710f99..e2fec46 100644
--- a/init.lua
+++ b/init.lua
@@ -4,7 +4,6 @@ vim.o.termguicolors = true
4vim.o.exrc = true 4vim.o.exrc = true
5 5
6if vim.fn.has("win32") then 6if vim.fn.has("win32") then
7 vim.o.shell = 'cmd.exe'
8 vim.opt.rtp:append(vim.fn.expand("$HOME\\scoop\\shims")) 7 vim.opt.rtp:append(vim.fn.expand("$HOME\\scoop\\shims"))
9end 8end
10 9
diff --git a/pack/all/start/vim-under-the-cursor b/pack/all/start/vim-under-the-cursor
new file mode 160000
Subproject f8a3dfbdf3b0b9d0eb18423115744f42660750f
diff --git a/plugin/max-find-bash.vim b/plugin/max-find-bash.vim
index a5e243b..29cb7c3 100644
--- a/plugin/max-find-bash.vim
+++ b/plugin/max-find-bash.vim
@@ -6,4 +6,6 @@ if filereadable("/bin/bash")
6 set shell=/bin/bash 6 set shell=/bin/bash
7elseif filereadable("/usr/local/bin/bash") 7elseif filereadable("/usr/local/bin/bash")
8 set shell=/usr/local/bin/bash 8 set shell=/usr/local/bin/bash
9elseif has("win32")
10 set shell = 'cmd.exe'
9endif 11endif
diff --git a/plugin/max-highlight-word-under-cursor.vim b/plugin/max-highlight-word-under-cursor.vim
deleted file mode 100644
index f18c212..0000000
--- a/plugin/max-highlight-word-under-cursor.vim
+++ /dev/null
@@ -1,26 +0,0 @@
1"=======================================================================================================================
2" HIGHLIGHT_WORD_UNDER_CURSOR:
3"=======================================================================================================================
4
5let w:m1 = 0
6function! HighlightWordUnderCursor()
7 if(exists('w:m1') && w:m1 > 0)
8 silent! call matchdelete(w:m1)
9 let w:m1 = 0
10 endif
11 let l:currentword = escape(expand('<cword>'), '.')
12 if(strlen(l:currentword) > 0)
13 let w:m1=100
14 let l:q = matchstr(expand('<cword>'), '\x\{6\}')
15 if(l:q != "")
16 exec 'highlight! CurrentColor guibg=#'.l:q
17 " call matchadd('CurrentColor', escape(expand('<cWORD>'), '.'), -1, w:m1)
18 " if(match(expand('<cword>'), '^#\x\{6\}\|^0x\x\{6\}') == 0)
19 hi CurrentColor
20 else
21 silent! call matchadd('Underline', '\<'.l:currentword.'\>', -1, w:m1)
22 endif
23 endif
24endfunction
25
26autocmd CursorHold,CursorHoldI * call HighlightWordUnderCursor()
diff --git a/plugin/youcompleteme.vim b/plugin/youcompleteme.vim
index 9e17ad5..a241dae 100644
--- a/plugin/youcompleteme.vim
+++ b/plugin/youcompleteme.vim
@@ -4,7 +4,7 @@ augroup YOUCOMPLETEME
4 4
5 let g:ycm_autoclose_preview_window_after_insertion = 0 5 let g:ycm_autoclose_preview_window_after_insertion = 0
6 let g:ycm_auto_trigger = 1 6 let g:ycm_auto_trigger = 1
7 let g:ycm_collect_identifiers_from_tags_files = 1 " Let YCM read tags from Ctags file 7 let g:ycm_collect_identifiers_from_tags_files = 0 " Let YCM read tags from Ctags file
8 let g:ycm_confirm_extra_conf = 0 " security is overrated ;) 8 let g:ycm_confirm_extra_conf = 0 " security is overrated ;)
9 let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that 9 let g:ycm_always_populate_location_list = 0 " we can manually run :YcmDiags to do that
10 10
diff --git a/vimrc-common b/vimrc-common
index 6c06c66..fb760cb 100644
--- a/vimrc-common
+++ b/vimrc-common
@@ -359,10 +359,10 @@ augroup KEYBOARD_MAPPING
359 359
360 " if the wildmenu is configured to to display suggestions vertically, then 360 " if the wildmenu is configured to to display suggestions vertically, then
361 " reconfigure the cursor keys to work in that direction 361 " reconfigure the cursor keys to work in that direction
362 " if &wildoptions =~# 'pum' 362 if &wildoptions =~# 'pum'
363 " cnoremap <expr> <up> pumvisible() ? "<C-p>" : "\<up>" 363 cnoremap <expr> <up> pumvisible() ? "<C-p>" : "\<up>"
364 " cnoremap <expr> <down> pumvisible() ? "<C-n>" : "\<down>" 364 cnoremap <expr> <down> pumvisible() ? "<C-n>" : "\<down>"
365 " endif 365 endif
366 366
367 367
368 " INSERT_MODE_MAPPINGS: 368 " INSERT_MODE_MAPPINGS:
..