diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | general/settings.vim | 2 | ||||
| -rw-r--r-- | init.vim | 3 | ||||
| -rw-r--r-- | keys/which-key.vim | 32 | ||||
| -rw-r--r-- | plug-config/vimspector.vim | 3 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 4 | ||||
| -rw-r--r-- | vimspector-config/configurations/linux/_all/java/vimspector.json | 25 |
7 files changed, 62 insertions, 9 deletions
@@ -4,7 +4,7 @@ tags* pythonpath.vim nodepath.vim autoload/plugged/* -vimspector-config/* +vimspector-config/gadgets/* paths.vim session wiki/ diff --git a/general/settings.vim b/general/settings.vim index c44b9c57..7d9ae1aa 100644 --- a/general/settings.vim +++ b/general/settings.vim @@ -35,7 +35,7 @@ set updatetime=300 " Faster completion set timeoutlen=100 " By default timeoutlen is 1000 ms set clipboard=unnamedplus " Copy paste between vim and everything else set incsearch -set guifont=Fira\ Code\ Nerd\ Font +set guifont=JetBrainsMono\ Nerd\ Font " New stuff " set notimeout nottimeout @@ -54,12 +54,12 @@ else source $HOME/.config/nvim/plug-config/markdown-preview.vim source $HOME/.config/nvim/plug-config/neovide.vim luafile $HOME/.config/nvim/lua/plug-colorizer.lua + source $HOME/.config/nvim/plug-config/vimspector.vim " 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 source $HOME/.config/nvim/plug-config/quickscope.vim @@ -72,4 +72,3 @@ endif " Better nav for omnicomplete TODO figure out why this is being overridden inoremap <expr> <c-j> ("\<C-n>") inoremap <expr> <c-k> ("\<C-p>") - diff --git a/keys/which-key.vim b/keys/which-key.vim index 38d972a6..5dcedce6 100644 --- a/keys/which-key.vim +++ b/keys/which-key.vim @@ -2,6 +2,11 @@ let @s = 'veS"' +" Timeout +let g:which_key_timeout = 100 + +let g:which_key_display_names = {'<CR>': '↵', '<TAB>': '⇆'} + " Map leader to which_key nnoremap <silent> <leader> :silent <c-u> :silent WhichKey '<Space>'<CR> vnoremap <silent> <leader> :silent <c-u> :silent WhichKeyVisual '<Space>'<CR> @@ -13,11 +18,16 @@ let g:which_key_sep = '→' " set timeoutlen=100 " Coc Search & refactor -nnoremap <leader>? :CocSearch <C-R>=expand("<cword>")<CR><CR> +nnoremap <leader>? CocSearch <C-R>=expand("<cword>")<CR><CR> let g:which_key_map['?'] = 'search word' " Not a fan of floating windows for this let g:which_key_use_floating_win = 0 +let g:which_key_max_size = 0 + +" let g:which_key_position = 'botright' +" let g:which_key_position = 'topleft' +" let g:which_key_vertical = 1 " Change the colors if you want @@ -32,7 +42,6 @@ let g:which_key_map['/'] = [ ':call Comment()' , let g:which_key_map['.'] = [ ':e $MYVIMRC' , 'open init' ] let g:which_key_map[';'] = [ ':Commands' , 'commands' ] let g:which_key_map['='] = [ '<C-W>=' , 'balance windows' ] -let g:which_key_map['d'] = [ ':Bdelete' , 'delete buffer'] let g:which_key_map['e'] = [ ':CocCommand explorer --toggle --sources=file+' , 'explorer' ] let g:which_key_map['h'] = [ '<C-W>s' , 'split below'] let g:which_key_map['n'] = [ ':let @/ = ""' , 'no highlight' ] @@ -92,6 +101,23 @@ let g:which_key_map.b = { \ '?' : ['Buffers' , 'fzf-buffer'], \ } +" d is for debug +let g:which_key_map.d = { + \ 'name' : '+debug' , + \ 'b' : ['<Plug>VimspectorToggleBreakpoint' , 'breakpoint'], + \ 'B' : ['<Plug>VimspectorToggleConditionalBreakpoint' , 'conditional breakpoint'], + \ 'c' : ['<Plug>VimspectorRunToCursor' , 'run to cursor'], + \ 'd' : ['<Plug>VimspectorContinue' , 'continue'], + \ 'f' : ['<Plug>VimspectorAddFunctionBreakpoint' , 'function breakpoint'], + \ 'm' : [':MaximizerToggle' , 'maximize window'], + \ 'o' : ['<Plug>VimspectorStepOver' , 'step over'], + \ 'O' : ['<Plug>VimspectorStepOut' , 'step out'], + \ 'i' : ['<Plug>VimspectorStepInto' , 'step into'], + \ 'p' : ['<Plug>VimspectorPause' , 'pause'], + \ 'r' : ['<Plug>VimspectorRestart' , 'restart'], + \ 's' : ['<Plug>VimspectorStop' , 'stop'], + \ } + " f is for find and replace let g:which_key_map.f = { \ 'name' : '+find & replace' , @@ -263,7 +289,7 @@ let g:which_key_map.l = { \ 'name' : '+lsp' , \ '.' : [':CocConfig' , 'config'], \ ';' : ['<Plug>(coc-refactor)' , 'refactor'], - \ 'a' : ['<Plug>(coc-codeaction)' , 'line action'], + \ 'a' : ['<Plug>(coc-codeaction)' , 'code action'], \ 'A' : ['<Plug>(coc-codeaction-selected)' , 'selected action'], \ 'b' : [':CocNext' , 'next action'], \ 'B' : [':CocPrev' , 'prev action'], diff --git a/plug-config/vimspector.vim b/plug-config/vimspector.vim index 97c639ff..3ab21951 100644 --- a/plug-config/vimspector.vim +++ b/plug-config/vimspector.vim @@ -1,3 +1,4 @@ " Experimental let g:vimspector_base_dir=expand( '$HOME/.config/nvim/vimspector-config' ) -let g:vimspector_enable_mappings='HUMAN' +let g:vimspector_enable_mappings='VISUAL_STUDIO' + diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 5cf73268..e541adde 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -108,6 +108,9 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'norcalli/nvim-colorizer.lua' " Intuitive buffer closing Plug 'moll/vim-bbye' + " Debugging + Plug 'puremourning/vimspector' + Plug 'szw/vim-maximizer' " Rainbow brackets " Plug 'luochen1990/rainbow' " Async Linting Engine @@ -164,7 +167,6 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Plug 'romgrk/lib.kom' " Plug 'brooth/far.vim' " Debugging - " Plug 'puremourning/vimspector' endif call plug#end() diff --git a/vimspector-config/configurations/linux/_all/java/vimspector.json b/vimspector-config/configurations/linux/_all/java/vimspector.json new file mode 100644 index 00000000..608ec1b7 --- /dev/null +++ b/vimspector-config/configurations/linux/_all/java/vimspector.json @@ -0,0 +1,25 @@ +{ + "adapters": { + "java-debug-server": { + "name": "vscode-java", + "port": "${AdapterPort}" + } + }, + "configurations": { + "Java Attach": { + "default": true, + "adapter": "java-debug-server", + "configuration": { + "request": "attach", + "host": "127.0.0.1", + "port": "5005" + }, + "breakpoints": { + "exception": { + "caught": "N", + "uncaught": "N" + } + } + } + } +} |