From 9379982b7ed35c1bae40725b11d2b372d9b56b1f Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 1 Sep 2020 20:34:19 -0400 Subject: vscodium updates --- ftplugin/markdown.vim | 1 + init.vim | 12 ++++---- vim-plug/plugins.vim | 38 ++++++++++++++------------ vscode/settings.vim | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++ vscode/windows.vim | 76 --------------------------------------------------- 5 files changed, 102 insertions(+), 100 deletions(-) create mode 100644 ftplugin/markdown.vim create mode 100644 vscode/settings.vim delete mode 100644 vscode/windows.vim diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim new file mode 100644 index 00000000..291b8115 --- /dev/null +++ b/ftplugin/markdown.vim @@ -0,0 +1 @@ +set wrap diff --git a/init.vim b/init.vim index 008c1a8c..4b42276e 100644 --- a/init.vim +++ b/init.vim @@ -11,29 +11,29 @@ source $HOME/.config/nvim/general/settings.vim source $HOME/.config/nvim/general/functions.vim source $HOME/.config/nvim/keys/mappings.vim source $HOME/.config/nvim/plug-config/vim-commentary.vim +source $HOME/.config/nvim/plug-config/quickscope.vim if exists('g:vscode') " VS Code extension - source $HOME/.config/nvim/vscode/windows.vim + source $HOME/.config/nvim/vscode/settings.vim source $HOME/.config/nvim/plug-config/easymotion.vim else " Themes source $HOME/.config/nvim/themes/syntax.vim source $HOME/.config/nvim/themes/onedark.vim - " source $HOME/.config/nvim/themes/material.vim source $HOME/.config/nvim/themes/airline.vim + " source $HOME/.config/nvim/themes/material.vim " Plugin Configuration source $HOME/.config/nvim/keys/which-key.vim + source $HOME/.config/nvim/plug-config/rainbow.vim source $HOME/.config/nvim/plug-config/rnvimr.vim source $HOME/.config/nvim/plug-config/better-whitespace.vim source $HOME/.config/nvim/plug-config/fzf.vim - source $HOME/.config/nvim/plug-config/rainbow.vim + source $HOME/.config/nvim/plug-config/sneak.vim source $HOME/.config/nvim/plug-config/codi.vim - source $HOME/.config/nvim/plug-config/quickscope.vim source $HOME/.config/nvim/plug-config/vim-wiki.vim - source $HOME/.config/nvim/plug-config/sneak.vim source $HOME/.config/nvim/plug-config/coc.vim source $HOME/.config/nvim/plug-config/goyo.vim source $HOME/.config/nvim/plug-config/vim-rooter.vim @@ -52,9 +52,9 @@ else source $HOME/.config/nvim/plug-config/asynctask.vim source $HOME/.config/nvim/plug-config/window-swap.vim source $HOME/.config/nvim/plug-config/markdown-preview.vim + luafile $HOME/.config/nvim/lua/plug-colorizer.lua " source $HOME/.config/nvim/plug-config/vimspector.vim " Uncomment if you want to use Vimspector " source $HOME/.config/nvim/plug-config/ale.vim - luafile $HOME/.config/nvim/lua/plug-colorizer.lua endif " Add paths to node and python here diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 1e07a4da..c423e0a7 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -10,32 +10,34 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Better Comments Plug 'tpope/vim-commentary' - - if exists('g:vscode') - " Easy motion for VSCode - Plug 'asvetliakov/vim-easymotion' - else - " Change dates fast Plug 'tpope/vim-speeddating' " Convert binary, hex, etc.. Plug 'glts/vim-radical' - " Files - Plug 'tpope/vim-eunuch' " Repeat stuff Plug 'tpope/vim-repeat' + " Text Navigation + Plug 'unblevable/quick-scope' + " Useful for React Commenting + Plug 'suy/vim-context-commentstring' + " highlight all matches under cursor + Plug 'RRethy/vim-illuminate' + + if exists('g:vscode') + " Easy motion for VSCode + Plug 'asvetliakov/vim-easymotion' + else + + " Sneak + Plug 'justinmk/vim-sneak' " Surround Plug 'tpope/vim-surround' + " Files + Plug 'tpope/vim-eunuch' " Have the file system follow you around Plug 'airblade/vim-rooter' " auto set indent settings Plug 'tpope/vim-sleuth' - " Text Navigation - Plug 'justinmk/vim-sneak' - Plug 'unblevable/quick-scope' - " Add some color - Plug 'norcalli/nvim-colorizer.lua' - Plug 'luochen1990/rainbow' " Better Syntax Support Plug 'sheerun/vim-polyglot' " Cool Icons @@ -82,8 +84,6 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'mg979/vim-xtabline' " undo time travel Plug 'mbbill/undotree' - " highlight all matches under cursor - Plug 'RRethy/vim-illuminate' " Find and replace Plug 'ChristianChiarulli/far.vim' " Plug 'brooth/far.vim' @@ -103,6 +103,10 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Easily Create Gists Plug 'mattn/vim-gist' Plug 'mattn/webapi-vim' + " Colorizer + Plug 'norcalli/nvim-colorizer.lua' + " Rainbow brackets + Plug 'luochen1990/rainbow' " Async Linting Engine " TODO make sure to add ale config before plugin " Plug 'dense-analysis/ale' @@ -112,8 +116,6 @@ call plug#begin('~/.config/nvim/autoload/plugged') " TODO add this back in change from C-n " Plug 'mg979/vim-visual-multi', {'branch': 'master'} Plug 'moll/vim-bbye' - " Useful for React Commenting - Plug 'suy/vim-context-commentstring' " Plugin Graveyard " jsx syntax support diff --git a/vscode/settings.vim b/vscode/settings.vim new file mode 100644 index 00000000..3df722a1 --- /dev/null +++ b/vscode/settings.vim @@ -0,0 +1,75 @@ +" TODO there is a more contemporary version of this file +"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 + +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 + +nnoremap s :call split('h') +xnoremap s :call split('h') + +nnoremap v :call split('v') +xnoremap v :call split('v') + +nnoremap n :call splitNew('h', '__vscode_new__') +xnoremap n :call splitNew('h', '__vscode_new__') + + +nnoremap = :call VSCodeNotify('workbench.action.evenEditorWidths') +xnoremap = :call VSCodeNotify('workbench.action.evenEditorWidths') + +nnoremap > :call manageEditorSize(v:count, 'increase') +xnoremap > :call manageEditorSize(v:count, 'increase') +nnoremap + :call manageEditorSize(v:count, 'increase') +xnoremap + :call manageEditorSize(v:count, 'increase') +nnoremap < :call manageEditorSize(v:count, 'decrease') +xnoremap < :call manageEditorSize(v:count, 'decrease') +nnoremap - :call manageEditorSize(v:count, 'decrease') +xnoremap - :call manageEditorSize(v:count, 'decrease') + +" 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') + +" Bind C-/ to vscode commentary since calling from vscode produces double comments due to multiple cursors +xnoremap :call Comment() +nnoremap :call Comment() + +nnoremap _ :call VSCodeNotify('workbench.action.toggleEditorWidths') + +nnoremap :call VSCodeNotify('whichkey.show') +xnoremap :call VSCodeNotify('whichkey.show') diff --git a/vscode/windows.vim b/vscode/windows.vim deleted file mode 100644 index e6ce55da..00000000 --- a/vscode/windows.vim +++ /dev/null @@ -1,76 +0,0 @@ -" TODO there is a more contemporary version of this file -"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 - -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 - -nnoremap s :call split('h') -xnoremap s :call split('h') - -nnoremap v :call split('v') -xnoremap v :call split('v') - -nnoremap n :call splitNew('h', '__vscode_new__') -xnoremap n :call splitNew('h', '__vscode_new__') - -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 = :call VSCodeNotify('workbench.action.evenEditorWidths') -xnoremap = :call VSCodeNotify('workbench.action.evenEditorWidths') - -nnoremap > :call manageEditorSize(v:count, 'increase') -xnoremap > :call manageEditorSize(v:count, 'increase') -nnoremap + :call manageEditorSize(v:count, 'increase') -xnoremap + :call manageEditorSize(v:count, 'increase') -nnoremap < :call manageEditorSize(v:count, 'decrease') -xnoremap < :call manageEditorSize(v:count, 'decrease') -nnoremap - :call manageEditorSize(v:count, 'decrease') -xnoremap - :call manageEditorSize(v:count, 'decrease') - -" Bind C-/ to vscode commentary since calling from vscode produces double comments due to multiple cursors -xnoremap :call Comment() -nnoremap :call Comment() - -nnoremap _ :call VSCodeNotify('workbench.action.toggleEditorWidths') - -" nnoremap :call VSCodeCall('whichkey.show') -" xnoremap :call VSCodeCall('whichkey.show') - -nnoremap :call VSCodeNotify('whichkey.show') -xnoremap :call VSCodeNotify('whichkey.show') -- cgit v1.2.3