From 4111b28ae89d04c171d9d252bf649f598aa6cbc2 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Mar 2021 10:41:54 -0400 Subject: remove keybinding --- lua/lsp/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/lsp/init.lua b/lua/lsp/init.lua index 0419f5c2..89969d54 100644 --- a/lua/lsp/init.lua +++ b/lua/lsp/init.lua @@ -10,7 +10,7 @@ vim.cmd('nnoremap gr lua vim.lsp.buf.references()') vim.cmd('nnoremap gi lua vim.lsp.buf.implementation()') vim.cmd('nnoremap ca :Lspsaga code_action') vim.cmd('nnoremap K :Lspsaga hover_doc') -vim.cmd('nnoremap lua vim.lsp.buf.signature_help()') +-- vim.cmd('nnoremap lua vim.lsp.buf.signature_help()') vim.cmd('nnoremap :Lspsaga diagnostic_jump_prev') vim.cmd('nnoremap :Lspsaga diagnostic_jump_next') -- scroll down hover doc or scroll in definition preview -- cgit v1.2.3 From 4ed47a3471fbf489c7426e0076746c02fbd8e83a Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Mar 2021 10:46:53 -0400 Subject: update comments --- lua/nv-kommentary/init.lua | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'lua') diff --git a/lua/nv-kommentary/init.lua b/lua/nv-kommentary/init.lua index c64290ae..dea90f75 100644 --- a/lua/nv-kommentary/init.lua +++ b/lua/nv-kommentary/init.lua @@ -1,16 +1,6 @@ vim.g.kommentary_create_default_mappings = false vim.api.nvim_set_keymap("n", "/", "kommentary_line_default", {}) ---vim.api.nvim_set_keymap("n", "c", "kommentary_motion_default", {}) vim.api.nvim_set_keymap("v", "/", "kommentary_visual_default", {}) ---[[vim.cmd([[ -function! Comment() - if (mode() == "n" ) - execute "Commentary" - else - execute "'<,'>Commentary" - endif - endfunction -vnoremap / :call Comment() -autocmd! BufRead,BufNewFile *.{jsx,jx,js} setlocal filetype=javascript.jsx -autocmd FileType javascript.jsx setlocal commentstring={/*\ %s\ */} -]] +require('kommentary.config').configure_language("default", { + prefer_single_line_comments = true, +}) -- cgit v1.2.3 From 516c505d2b0741ab9dce6f700c6523256a156574 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Mar 2021 10:55:30 -0400 Subject: add devicons back --- lua/nv-startify/init.lua | 7 +++++++ lua/plugins.lua | 1 + 2 files changed, 8 insertions(+) (limited to 'lua') diff --git a/lua/nv-startify/init.lua b/lua/nv-startify/init.lua index e0e341d0..8e05cdbd 100644 --- a/lua/nv-startify/init.lua +++ b/lua/nv-startify/init.lua @@ -20,3 +20,10 @@ vim.g.startify_session_dir = '~/.config/nvim/session' vim.api.nvim_exec('let startify_lists = [ { \'type\': \'files\', \'header\': [\' Files\'] }, { \'type\': \'sessions\', \'header\': [\' Sessions\'] }, { \'type\': \'bookmarks\', \'header\': [\' Bookmarks\'] }, ]',true) vim.api.nvim_exec('let startify_bookmarks = [ { \'b\': \'~/Blog\' }, { \'i\': \'~/.config/nvim/init.vim\' }, { \'z\': \'~/.zshrc\' }]', true) + +vim.cmd([[ +function! StartifyEntryFormat() + return 'WebDevIconsGetFileTypeSymbol(absolute_path) ." ". entry_path' +endfunction +]]) + diff --git a/lua/plugins.lua b/lua/plugins.lua index 01766f66..2bd457ca 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -41,6 +41,7 @@ return require('packer').startup(function() -- Icons use 'kyazdani42/nvim-web-devicons' + use 'ryanoasis/vim-devicons' -- Status Line and Bufferline use 'glepnir/galaxyline.nvim' -- cgit v1.2.3 From dae005f87f91b5ce150629f86f5f376a1f90f253 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Mar 2021 11:54:53 -0400 Subject: updates --- lua/keymappings.lua | 2 ++ lua/lsp/js-ts-ls.lua | 9 ++++++++- lua/nv-compe/init.lua | 2 ++ lua/plugins.lua | 4 ++++ 4 files changed, 16 insertions(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/keymappings.lua b/lua/keymappings.lua index fe910de5..b5a57924 100644 --- a/lua/keymappings.lua +++ b/lua/keymappings.lua @@ -59,6 +59,8 @@ vim.api.nvim_set_keymap('x', 'J', ':move \'>+1gv-gv', { noremap = true, sile -- Better nav for omnicomplete vim.cmd('inoremap (\"\\\")') vim.cmd('inoremap (\"\\\")') +-- vim.cmd('inoremap (\"\\\")') +-- vim.cmd('inoremap (\"\\\")') -- TAB Complete --vim.api.nvim_set_keymap('i', '', 'pumvisible() ? \"\\\" : \"\\\"', { noremap = true, silent = true }) diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua index 9d35fcbf..a1276d6d 100644 --- a/lua/lsp/js-ts-ls.lua +++ b/lua/lsp/js-ts-ls.lua @@ -1,2 +1,9 @@ -- npm install -g typescript typescript-language-server -require'lspconfig'.tsserver.setup{} +require'snippets'.use_suggested_mappings() + +local capabilities = vim.lsp.protocol.make_client_capabilities() +capabilities.textDocument.completion.completionItem.snippetSupport = true; +require'lspconfig'.tsserver.setup{ + capabilities = capabilities, + on_attach = on_attach +} diff --git a/lua/nv-compe/init.lua b/lua/nv-compe/init.lua index 4dcfe26a..75fa9b55 100644 --- a/lua/nv-compe/init.lua +++ b/lua/nv-compe/init.lua @@ -1,3 +1,5 @@ +vim.o.completeopt = "menuone,noselect" + require'compe'.setup { enabled = true; autocomplete = true; diff --git a/lua/plugins.lua b/lua/plugins.lua index 2bd457ca..d54a59db 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -33,6 +33,10 @@ return require('packer').startup(function() -- Autocomplete use 'hrsh7th/nvim-compe' use 'hrsh7th/vim-vsnip' + use 'honza/vim-snippets' + use 'norcalli/snippets.nvim' + + -- use 'SirVer/ultisnips' -- Treesitter use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' } -- cgit v1.2.3 From 8f10e3cf3d271e827d65823d79db76da944c29d8 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Mar 2021 12:14:48 -0400 Subject: auto close tags --- lua/lsp/js-ts-ls.lua | 1 - lua/nv-closetag/init.lua | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 lua/nv-closetag/init.lua (limited to 'lua') diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua index a1276d6d..e6e856d1 100644 --- a/lua/lsp/js-ts-ls.lua +++ b/lua/lsp/js-ts-ls.lua @@ -5,5 +5,4 @@ local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true; require'lspconfig'.tsserver.setup{ capabilities = capabilities, - on_attach = on_attach } diff --git a/lua/nv-closetag/init.lua b/lua/nv-closetag/init.lua new file mode 100644 index 00000000..8c116410 --- /dev/null +++ b/lua/nv-closetag/init.lua @@ -0,0 +1,3 @@ +vim.g.closetag_filenames = '*.html,*.xhtml,*.phtml' +vim.g.closetag_xhtml_filenames = '*.xhtml,*.jsx,*.js' +vim.g.closetag_filetypes = 'html,xhtml,phtml,javascript,javascriptreact' -- cgit v1.2.3 From d9c899652bdc29aa99ea5c2582bdc49d01655a4f Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Mar 2021 12:34:37 -0400 Subject: add git blame plugin --- lua/nv-gitblame/init.lua | 2 ++ lua/nv-whichkey/init.vim | 4 +++- lua/plugins.lua | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 lua/nv-gitblame/init.lua (limited to 'lua') diff --git a/lua/nv-gitblame/init.lua b/lua/nv-gitblame/init.lua new file mode 100644 index 00000000..12645a7f --- /dev/null +++ b/lua/nv-gitblame/init.lua @@ -0,0 +1,2 @@ +vim.cmd('highlight default link gitblame SpecialComment') +vim.g.gitblame_enabled = 0 diff --git a/lua/nv-whichkey/init.vim b/lua/nv-whichkey/init.vim index 313deada..54919914 100644 --- a/lua/nv-whichkey/init.vim +++ b/lua/nv-whichkey/init.vim @@ -31,9 +31,11 @@ let g:which_key_map['e'] = [ ':NvimTreeToggle' , let g:which_key_map['h'] = [ 's' , 'split below'] let g:which_key_map['n'] = [ ':let @/ = ""' , 'no highlight' ] let g:which_key_map['r'] = [ ':RnvimrToggle' , 'ranger' ] +" TODO create entire treesitter section let g:which_key_map['T'] = [ ':TSHighlightCapturesUnderCursor' , 'treesitter highlight' ] let g:which_key_map['v'] = [ 'v' , 'split right'] -let g:which_key_map['z'] = [ 'Goyo' , 'zen' ] +" Add Zen mode, play nice with status line +" let g:which_key_map['z'] = [ 'Goyo' , 'zen' ] " Group mappings diff --git a/lua/plugins.lua b/lua/plugins.lua index d54a59db..3dae1994 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -69,6 +69,7 @@ return require('packer').startup(function() -- Git use 'TimUntersberger/neogit' use {'lewis6991/gitsigns.nvim', requires = { 'nvim-lua/plenary.nvim' } } + use 'f-person/git-blame.nvim' -- Easily Create Gists use 'mattn/vim-gist' -- cgit v1.2.3 From 570e143562b382d82b3e691cafe7bdf0f2d25160 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 15 Mar 2021 12:58:57 -0400 Subject: support vscode --- lua/nv-vscode/init.vim | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 lua/nv-vscode/init.vim (limited to 'lua') diff --git a/lua/nv-vscode/init.vim b/lua/nv-vscode/init.vim new file mode 100644 index 00000000..9ca19a3b --- /dev/null +++ b/lua/nv-vscode/init.vim @@ -0,0 +1,105 @@ +" TODO there is a more contemporary version of this file +" TODO Also some of it is redundant +"VSCode +function! s:split(...) abort + let direction = a:1 + let file = a:2 + call VSCodeCall(direction == 'h' ? 'workbench.action.splitEditorDown' : 'workbench.action.splitEditorRight') + if file != '' + call VSCodeExtensionNotify('open-file', expand(file), 'all') + endif +endfunction + +function! s:splitNew(...) + let file = a:2 + call s:split(a:1, file == '' ? '__vscode_new__' : file) +endfunction + +function! s:closeOtherEditors() + call VSCodeNotify('workbench.action.closeEditorsInOtherGroups') + call VSCodeNotify('workbench.action.closeOtherEditors') +endfunction + +function! s:manageEditorSize(...) + let count = a:1 + let to = a:2 + for i in range(1, count ? count : 1) + call VSCodeNotify(to == 'increase' ? 'workbench.action.increaseViewSize' : 'workbench.action.decreaseViewSize') + endfor +endfunction + +function! s:vscodeCommentary(...) abort + if !a:0 + let &operatorfunc = matchstr(expand(''), '[^. ]*$') + return 'g@' + elseif a:0 > 1 + let [line1, line2] = [a:1, a:2] + else + let [line1, line2] = [line("'["), line("']")] + endif + + call VSCodeCallRange("editor.action.commentLine", line1, line2, 0) +endfunction + +function! s:openVSCodeCommandsInVisualMode() + normal! gv + let visualmode = visualmode() + if visualmode == "V" + let startLine = line("v") + let endLine = line(".") + call VSCodeNotifyRange("workbench.action.showCommands", startLine, endLine, 1) + else + let startPos = getpos("v") + let endPos = getpos(".") + call VSCodeNotifyRangePos("workbench.action.showCommands", startPos[1], endPos[1], startPos[2], endPos[2], 1) + endif +endfunction + +function! s:openWhichKeyInVisualMode() + normal! gv + let visualmode = visualmode() + if visualmode == "V" + let startLine = line("v") + let endLine = line(".") + call VSCodeNotifyRange("whichkey.show", startLine, endLine, 1) + else + let startPos = getpos("v") + let endPos = getpos(".") + call VSCodeNotifyRangePos("whichkey.show", startPos[1], endPos[1], startPos[2], endPos[2], 1) + endif +endfunction + + +command! -complete=file -nargs=? Split call split('h', ) +command! -complete=file -nargs=? Vsplit call split('v', ) +command! -complete=file -nargs=? New call split('h', '__vscode_new__') +command! -complete=file -nargs=? Vnew call split('v', '__vscode_new__') +command! -bang Only if == '!' | call closeOtherEditors() | else | call VSCodeNotify('workbench.action.joinAllGroups') | endif + +" Better Navigation +nnoremap :call VSCodeNotify('workbench.action.navigateDown') +xnoremap :call VSCodeNotify('workbench.action.navigateDown') +nnoremap :call VSCodeNotify('workbench.action.navigateUp') +xnoremap :call VSCodeNotify('workbench.action.navigateUp') +nnoremap :call VSCodeNotify('workbench.action.navigateLeft') +xnoremap :call VSCodeNotify('workbench.action.navigateLeft') +nnoremap :call VSCodeNotify('workbench.action.navigateRight') +xnoremap :call VSCodeNotify('workbench.action.navigateRight') + +nnoremap gr call VSCodeNotify('editor.action.goToReferences') + +" Bind C-/ to vscode commentary since calling from vscode produces double comments due to multiple cursors +xnoremap vscodeCommentary() +nnoremap vscodeCommentary() . '_' + +nnoremap _ :call VSCodeNotify('workbench.action.toggleEditorWidths') + +nnoremap :call VSCodeNotify('whichkey.show') +xnoremap :call openWhichKeyInVisualMode() + +xnoremap :call openVSCodeCommandsInVisualMode() + +xmap gc VSCodeCommentary +nmap gc VSCodeCommentary +omap gc VSCodeCommentary +nmap gcc VSCodeCommentaryLine -- cgit v1.2.3