diff options
| author | Chris <[email protected]> | 2020-07-18 14:51:49 -0400 |
|---|---|---|
| committer | Chris <[email protected]> | 2020-07-18 14:51:49 -0400 |
| commit | 5d78f939f12fb760a857443e42f75b761222fe0f (patch) | |
| tree | e77ffbaa3f35bebba8c570416dbaaa39e5857dd5 | |
| parent | f3fab2c54ec226e4d55839019c9ed9ce58987a10 (diff) | |
| parent | b900635a06de0c8cf051e6a980db0882f4296261 (diff) | |
Merge branch 'master' of github.com:ChristianChiarulli/nvim
| -rw-r--r-- | init.vim | 3 | ||||
| -rw-r--r-- | keys/which-key.vim | 2 | ||||
| -rw-r--r-- | plug-config/vim-commentary.vim | 8 | ||||
| -rw-r--r-- | themes/airline.vim | 1 | ||||
| -rw-r--r-- | vim-plug/plugins.vim | 4 |
5 files changed, 15 insertions, 3 deletions
@@ -24,7 +24,8 @@ else source $HOME/.config/nvim/themes/airline.vim source $HOME/.config/nvim/plug-config/rnvimr.vim source $HOME/.config/nvim/plug-config/fzf.vim - source $HOME/.config/nvim/plug-config/nerd-commenter.vim + "source $HOME/.config/nvim/plug-config/nerd-commenter.vim switching to vim-commentary + source $HOME/.config/nvim/plug-config/vim-commentary.vim source $HOME/.config/nvim/plug-config/rainbow.vim source $HOME/.config/nvim/plug-config/codi.vim source $HOME/.config/nvim/plug-config/quickscope.vim diff --git a/keys/which-key.vim b/keys/which-key.vim index 661882c1..cc0c41a2 100644 --- a/keys/which-key.vim +++ b/keys/which-key.vim @@ -25,7 +25,7 @@ autocmd FileType which_key set laststatus=0 noshowmode noruler " Single mappings -let g:which_key_map['/'] = [ ':Commentary' , 'comment' ] +let g:which_key_map['/'] = [ ':call Comment()' , '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' ] diff --git a/plug-config/vim-commentary.vim b/plug-config/vim-commentary.vim new file mode 100644 index 00000000..b6758b38 --- /dev/null +++ b/plug-config/vim-commentary.vim @@ -0,0 +1,8 @@ +function! Comment() + if (mode() == "n" ) + execute "Commentary" + else + execute "'<,'>Commentary" + endif + endfunction +vnoremap <silent> <space>/ :call Comment() diff --git a/themes/airline.vim b/themes/airline.vim index 828e726c..85c27b20 100644 --- a/themes/airline.vim +++ b/themes/airline.vim @@ -13,7 +13,6 @@ let g:airline#extensions#tabline#show_tab_type = 0 let g:airline#extensions#tabline#show_tab_nr = 0 let g:airline#extensions#tabline#fnamecollapse = 1 -let g:airline#extensions#tabline#show_tab_type = 0 let g:airline#extensions#tabline#buffers_label = '' let g:airline#extensions#tabline#tabs_label = '' diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 6b580108..7369468a 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -8,6 +8,10 @@ endif call plug#begin('~/.config/nvim/autoload/plugged') + " jsx syntax support + Plug 'maxmellon/vim-jsx-pretty' + + Plug 'suy/vim-context-commentstring' " Change dates fast Plug 'tpope/vim-speeddating' " Convert binary, hex, etc.. |