diff options
| author | Chris <[email protected]> | 2020-05-23 13:40:45 -0400 |
|---|---|---|
| committer | Chris <[email protected]> | 2020-05-23 13:40:45 -0400 |
| commit | 1079af5edebaa4ca1f15ee5cab42ef2ef5b60389 (patch) | |
| tree | 02304cec5936b2f91f35b5debdcc78cf913b3546 /vim-plug/plugins.vim | |
| parent | 264df1df7f25e9fa4c6899897ce4953c2caf53df (diff) | |
| parent | 8c79cce05aee02f8453c60d605706a5ea8adc764 (diff) | |
merge conflicts
Diffstat (limited to 'vim-plug/plugins.vim')
| -rw-r--r-- | vim-plug/plugins.vim | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim index 64cf2416..a97fdbf3 100644 --- a/vim-plug/plugins.vim +++ b/vim-plug/plugins.vim @@ -19,7 +19,8 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Surround Plug 'tpope/vim-surround' " Better Comments - Plug 'preservim/nerdcommenter' + Plug 'tpope/vim-commentary' + " Plug 'preservim/nerdcommenter' " Have the file system follow you around Plug 'airblade/vim-rooter' " auto set indent settings @@ -80,16 +81,17 @@ call plug#begin('~/.config/nvim/autoload/plugged') Plug 'junegunn/goyo.vim' " Making stuff Plug 'neomake/neomake' - " Snippets TODO fix TAB hijack + " Snippets Plug 'honza/vim-snippets' - " Plug 'SirVer/ultisnips' + Plug 'mattn/emmet-vim' " Better Comments " Plug 'jbgutierrez/vim-better-comments' " Echo doc " Plug 'Shougo/echodoc.vim' " Interactive code Plug 'metakirby5/codi.vim' - Plug 'mattn/emmet-vim' + " Vim Wiki + Plug 'https://github.com/vimwiki/vimwiki.git' endif |