diff options
author | gxlin <[email protected]> | 2021-06-16 00:55:31 +0800 |
---|---|---|
committer | gxlin <[email protected]> | 2021-06-16 22:39:15 +0800 |
commit | f456d790b007c3841549ec35a996483135cceec3 (patch) | |
tree | e9352e4806ebe27326dba032ef6929157344f87f | |
parent | a3c1649a195cf87db6581b5a8c703fa867462210 (diff) | |
download | dotfiles-f456d790b007c3841549ec35a996483135cceec3.tar.gz dotfiles-f456d790b007c3841549ec35a996483135cceec3.tar.bz2 dotfiles-f456d790b007c3841549ec35a996483135cceec3.zip |
Add vim-godot plug
-rw-r--r-- | .ctags.d/gdscript.ctags | 5 | ||||
-rw-r--r-- | .vim/plugins/airline.plug (renamed from .vim/plugins/airline.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/ale.vim | 4 | ||||
-rw-r--r-- | .vim/plugins/asyncrun.plug | 5 | ||||
-rw-r--r-- | .vim/plugins/easymotion.plug (renamed from .vim/plugins/easymotion.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/fugitive.plug (renamed from .vim/plugins/fugitive.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/general.plug | 9 | ||||
-rw-r--r-- | .vim/plugins/godot.vim | 35 | ||||
-rw-r--r-- | .vim/plugins/gutentags.plug (renamed from .vim/plugins/gutentags.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/init.vim | 15 | ||||
-rw-r--r-- | .vim/plugins/lang.plug | 2 | ||||
-rw-r--r-- | .vim/plugins/leaderf.vim | 5 | ||||
-rw-r--r-- | .vim/plugins/ledger.plug (renamed from .vim/plugins/ledger.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/lsp.plug (renamed from .vim/plugins/lsp.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/markdown.plug (renamed from .vim/plugins/markdown.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/misc.plug (renamed from .vim/plugins/misc.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/slime.plug (renamed from .vim/plugins/slime.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/startify.plug (renamed from .vim/plugins/startify.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/tex.plug (renamed from .vim/plugins/tex.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/vimspector.plug (renamed from .vim/plugins/vimspector.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/vimwiki.plug (renamed from .vim/plugins/vimwiki.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/vista.plug (renamed from .vim/plugins/vista.vim) | 0 | ||||
-rw-r--r-- | .vim/plugins/youcompleteme.vim | 7 |
23 files changed, 73 insertions, 14 deletions
diff --git a/.ctags.d/gdscript.ctags b/.ctags.d/gdscript.ctags new file mode 100644 index 0000000..89789c1 --- /dev/null +++ b/.ctags.d/gdscript.ctags @@ -0,0 +1,5 @@ +--langdef=GDScript +--langmap=GDScript:.gd +--regex-GDScript=/^func[ \t]+([a-zA-Z0-9_]+)/\1/f,function,function definitions/ +--regex-GDScript=/^(onready[ \t]+)?var[ \t]+([a-zA-Z0-9_]+)/\2/v,variable,variable definitions/ +--regex-GDScript=/^(export[ \t]*(.*)?[ \t]+)?var[ \t]+([a-zA-Z0-9_]+)/\3/v,variable,variable definitions/ diff --git a/.vim/plugins/airline.vim b/.vim/plugins/airline.plug index a1c1b94..a1c1b94 100644 --- a/.vim/plugins/airline.vim +++ b/.vim/plugins/airline.plug diff --git a/.vim/plugins/ale.vim b/.vim/plugins/ale.vim index f092c62..105bfa8 100644 --- a/.vim/plugins/ale.vim +++ b/.vim/plugins/ale.vim @@ -1,6 +1,6 @@ -Plug 'dense-analysis/ale' - let g:ale_linters_explicit = 1 +let g:ale_completion_enabled = 1 +let g:ale_completion_autoimport = 1 let g:ale_completion_delay = 500 let g:ale_echo_delay = 20 let g:ale_lint_delay = 500 diff --git a/.vim/plugins/asyncrun.plug b/.vim/plugins/asyncrun.plug new file mode 100644 index 0000000..bed9473 --- /dev/null +++ b/.vim/plugins/asyncrun.plug @@ -0,0 +1,5 @@ +let g:asyncrun_open = 6 " the number of lines of quickfix window +let g:asyncrun_bell = 1 " the bell rings when the task is done +" use f10 to open/close asyncrun quickfix window +nnoremap <F10> :call asyncrun#quickfix_toggle(6)<cr> + diff --git a/.vim/plugins/easymotion.vim b/.vim/plugins/easymotion.plug index ce87f12..ce87f12 100644 --- a/.vim/plugins/easymotion.vim +++ b/.vim/plugins/easymotion.plug diff --git a/.vim/plugins/fugitive.vim b/.vim/plugins/fugitive.plug index 8029fc3..8029fc3 100644 --- a/.vim/plugins/fugitive.vim +++ b/.vim/plugins/fugitive.plug diff --git a/.vim/plugins/general.plug b/.vim/plugins/general.plug new file mode 100644 index 0000000..fd57452 --- /dev/null +++ b/.vim/plugins/general.plug @@ -0,0 +1,9 @@ +Plug 'Yggdroot/LeaderF', {'do': ':LeaderfInstallCExtension'} +Plug 'Valloric/YouCompleteMe', { + \ 'do': 'python3 ./install.py --clangd-completer', + \ 'for': ['python', 'cpp', 'go', 'gdscript'] + \ } +Plug 'dense-analysis/ale' + +let g:ycm_language_server = [] +let g:Lf_RootMarkers = [] diff --git a/.vim/plugins/godot.vim b/.vim/plugins/godot.vim new file mode 100644 index 0000000..49354f8 --- /dev/null +++ b/.vim/plugins/godot.vim @@ -0,0 +1,35 @@ +if has('macunix') + let g:godot_executable = '/Applications/Godot.app' +endif +if has('win32') || has('win32unix') + let g:godot_executable = '' +endif + +let g:ycm_language_server += [ + \ { + \ 'name': 'godot', + \ 'filetypes': ['gdscript'], + \ 'project_root_files': ['project.godot'], + \ 'port': 6008 + \ } + \ ] + +let g:Lf_RootMarkers += ['project.godot'] + +func! s:godot_settings() abort + setlocal tabstop=4 + nnoremap <buffer> <leader>rl :GodotRunLast<CR> + nnoremap <buffer> <leader>rc :GodotRunCurrent<CR> + nnoremap <buffer> <leader>rr :GodotRun<CR> +endfunc + +augroup godot | au! + au FileType gdscript call s:godot_settings() +augroup end + +call ale#linter#Define('gdscript', { +\ 'name': 'godot', +\ 'lsp': 'socket', +\ 'address': '127.0.0.1:6008', +\ 'project_root': 'project.godot', +\ }) diff --git a/.vim/plugins/gutentags.vim b/.vim/plugins/gutentags.plug index c2a7090..c2a7090 100644 --- a/.vim/plugins/gutentags.vim +++ b/.vim/plugins/gutentags.plug diff --git a/.vim/plugins/init.vim b/.vim/plugins/init.vim index 590f18c..6b8bff2 100644 --- a/.vim/plugins/init.vim +++ b/.vim/plugins/init.vim @@ -4,12 +4,19 @@ if empty(glob('~/.vim/autoload/plug.vim')) autocmd VimEnter * PlugInstall --sync | source $MYVIMRC endif -let s:plugins = split(expand('~/.dotfiles/.vim/plugins/*.vim')) +let s:plugins = split(expand('~/.dotfiles/.vim/plugins/*.plug')) +let s:settings = split(expand('~/.dotfiles/.vim/plugins/*.vim')) function! s:load_plugins() for plugin in s:plugins - if plugin !~ 'init.vim' - exec "source " . plugin + exec "source " . plugin + endfor +endfunction + +function! s:load_settings() + for setting in s:settings + if setting !~ 'init.vim' + exec "source " . setting endif endfor endfunction @@ -17,3 +24,5 @@ endfunction call plug#begin('~/.vim/plugged') call s:load_plugins() call plug#end() + +call s:load_settings() diff --git a/.vim/plugins/lang.plug b/.vim/plugins/lang.plug new file mode 100644 index 0000000..338de43 --- /dev/null +++ b/.vim/plugins/lang.plug @@ -0,0 +1,2 @@ +Plug 'habamax/vim-godot', {'for': 'gdscript'} + diff --git a/.vim/plugins/leaderf.vim b/.vim/plugins/leaderf.vim index 116a994..043fe1b 100644 --- a/.vim/plugins/leaderf.vim +++ b/.vim/plugins/leaderf.vim @@ -1,5 +1,3 @@ -Plug 'Yggdroot/LeaderF', {'do': ':LeaderfInstallCExtension'} - " " Show icons, icons are shown by default let g:Lf_ShowDevIcons = 1 @@ -19,4 +17,5 @@ xnoremap gf :<C-U><C-R>=printf("Leaderf! rg -F -e %s ", leaderf#Rg#visual())<CR> noremap go :<C-U>Leaderf! rg --recall<CR> let g:Lf_WorkingDirectoryMode = 'AF' -let g:Lf_RootMarkers = ['.project', '.root', '.svn', '.git', '.hg', '.projectile'] + +let g:Lf_RootMarkers += ['.project', '.root', '.svn', '.git', '.hg', '.projectile'] diff --git a/.vim/plugins/ledger.vim b/.vim/plugins/ledger.plug index b3a1e25..b3a1e25 100644 --- a/.vim/plugins/ledger.vim +++ b/.vim/plugins/ledger.plug diff --git a/.vim/plugins/lsp.vim b/.vim/plugins/lsp.plug index 1a5704b..1a5704b 100644 --- a/.vim/plugins/lsp.vim +++ b/.vim/plugins/lsp.plug diff --git a/.vim/plugins/markdown.vim b/.vim/plugins/markdown.plug index 1e12dad..1e12dad 100644 --- a/.vim/plugins/markdown.vim +++ b/.vim/plugins/markdown.plug diff --git a/.vim/plugins/misc.vim b/.vim/plugins/misc.plug index f79b438..f79b438 100644 --- a/.vim/plugins/misc.vim +++ b/.vim/plugins/misc.plug diff --git a/.vim/plugins/slime.vim b/.vim/plugins/slime.plug index 0989a66..0989a66 100644 --- a/.vim/plugins/slime.vim +++ b/.vim/plugins/slime.plug diff --git a/.vim/plugins/startify.vim b/.vim/plugins/startify.plug index a4f7c1d..a4f7c1d 100644 --- a/.vim/plugins/startify.vim +++ b/.vim/plugins/startify.plug diff --git a/.vim/plugins/tex.vim b/.vim/plugins/tex.plug index 6c3f788..6c3f788 100644 --- a/.vim/plugins/tex.vim +++ b/.vim/plugins/tex.plug diff --git a/.vim/plugins/vimspector.vim b/.vim/plugins/vimspector.plug index a39d4bd..a39d4bd 100644 --- a/.vim/plugins/vimspector.vim +++ b/.vim/plugins/vimspector.plug diff --git a/.vim/plugins/vimwiki.vim b/.vim/plugins/vimwiki.plug index cba8593..cba8593 100644 --- a/.vim/plugins/vimwiki.vim +++ b/.vim/plugins/vimwiki.plug diff --git a/.vim/plugins/vista.vim b/.vim/plugins/vista.plug index 02264b9..02264b9 100644 --- a/.vim/plugins/vista.vim +++ b/.vim/plugins/vista.plug diff --git a/.vim/plugins/youcompleteme.vim b/.vim/plugins/youcompleteme.vim index 050969d..4c9f570 100644 --- a/.vim/plugins/youcompleteme.vim +++ b/.vim/plugins/youcompleteme.vim @@ -1,8 +1,3 @@ -Plug 'Valloric/YouCompleteMe', { - \ 'do': 'python3 ./install.py --clangd-completer', - \ 'for': ['python', 'cpp'] - \ } - let g:ycm_server_log_level = 'info' let g:ycm_add_preview_to_completeopt = 0 let g:ycm_show_diagnostics_ui = 0 @@ -11,7 +6,7 @@ let g:ycm_complete_in_strings = 1 let g:ycm_filetype_whilelist = { \ "c": 1, "cpp": 1, "sh": 1, "zsh": 1, - \ "python": 1, "go": 1, + \ "python": 1, "go": 1, "gdscript": 1 \ } let g:ycm_filetype_blacklist = { \ 'ledger': 1 |