Native LSP, more Lua, less CoC

2 files changed, 117 insertions, 105 deletions

diff --git a/vim-plug/extras.vim b/vim-plug/extras.vim
new file mode 100644
index 00000000..3f07fb87
--- /dev/null
+++ b/vim-plug/extras.vim
@@ -0,0 +1,84 @@
+    " Plugin Graveyard
+    " Rainbow brackets
+    " Plug 'luochen1990/rainbow'
+    " Async Linting Engine
+    " TODO make sure to add ale config before plugin
+    " Plug 'dense-analysis/ale'
+    " Better Whitespace
+    " Plug 'ntpeters/vim-better-whitespace'
+    " Multiple Cursors
+    " TODO add this back in change from C-n
+    " Plug 'mg979/vim-visual-multi', {'branch': 'master'}
+    " Plug 'yuezk/vim-js'
+    " Plug 'maxmellon/vim-jsx-pretty'
+    " Plug 'jelera/vim-javascript-syntax'
+    " Debug
+    " Plug 'mfussenegger/nvim-dap'
+    " Plug 'nvim-dap-virtual-text'
+    " Sneak
+    " Plug 'justinmk/vim-sneak'
+    " Minimap
+    " Plug 'wfxr/minimap.vim'
+    " jsx syntax support
+    " Typescript syntax
+    " Plug 'HerringtonDarkholme/yats.vim'
+    " Multiple Cursors
+    " Plug 'terryma/vim-multiple-cursors'
+    " Plug 'kaicataldo/material.vim'
+    " Plug 'tomasiser/vim-code-dark'
+    " Plug 'mg979/vim-xtabline'
+    " Files
+    " Plug 'tpope/vim-eunuch'
+    " Vim Wiki
+    " Plug 'https://github.com/vimwiki/vimwiki.git'
+    " Better Comments
+    " Plug 'jbgutierrez/vim-better-comments'
+    " Echo doc
+    " Plug 'Shougo/echodoc.vim'
+    " Plug 'hardcoreplayers/spaceline.vim'
+    " Plug 'vim-airline/vim-airline'
+    " Plug 'vim-airline/vim-airline-themes'
+    " Ranger
+    " Plug 'francoiscabrol/ranger.vim'
+    " Plug 'rbgrouleff/bclose.vim'
+    " Making stuff
+    " Plug 'neomake/neomake'
+    " Plug 'mhinz/vim-signify'
+    " Plug 'preservim/nerdcommenter'
+    " Plug 'atishay/far.vim'
+    " Plug 'romgrk/lib.kom'
+    " Plug 'brooth/far.vim'
+    " Debugging
+    " Repeat stuff
+    " Plug 'tpope/vim-repeat'
+    " Convert binary, hex, etc..
+    " Plug 'glts/vim-radical'
+    " highlight all matches under cursor
+    " Plug 'RRethy/vim-illuminate'
+    " Surround
+    " Plug 'tpope/vim-surround'
+    " auto set indent settings
+    " Plug 'tpope/vim-sleuth'
+    " FZF
+    " Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+    " Plug 'yuki-ycino/fzf-preview.vim', { 'branch': 'release', 'do': ':UpdateRemotePlugins' }
+    " Plug 'junegunn/fzf.vim'
+    " undo time travel
+    " Plug 'mbbill/undotree'
+    " " async tasks
+    " Plug 'skywind3000/asynctasks.vim'
+    " Plug 'skywind3000/asyncrun.vim'
+    " CoC           
+    " Plug 'neoclide/coc.nvim', {'branch': 'release'}
+    " Swap windows
+    " Plug 'wesQ3/vim-windowswap'
+    " Debugging
+    " Plug 'puremourning/vimspector'
+    " Plug 'szw/vim-maximizer'
+    " Treesitter
+    " Plug 'nvim-treesitter/playground'
+    " Plug 'nvim-treesitter/nvim-treesitter-refactor'
+    " Plug 'nvim-treesitter/nvim-treesitter-textobjects'
+    " Plug 'romgrk/nvim-treesitter-context'
+    " Neovim in Browser
+    " Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(1) } }
diff --git a/vim-plug/plugins.vim b/vim-plug/plugins.vim
index 442e3ffa..4ca5f710 100644
--- a/vim-plug/plugins.vim
+++ b/vim-plug/plugins.vim
@@ -12,16 +12,10 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'tpope/vim-commentary'
     " Change dates fast
     Plug 'tpope/vim-speeddating'
-    " Convert binary, hex, etc..
-    Plug 'glts/vim-radical'
-    " 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
@@ -32,41 +26,19 @@ call plug#begin('~/.config/nvim/autoload/plugged')
 
     " Easymotion
     Plug 'easymotion/vim-easymotion'
-    " Surround
-    Plug 'tpope/vim-surround'
     " Have the file system follow you around
     Plug 'airblade/vim-rooter'
-    " auto set indent settings
-    Plug 'tpope/vim-sleuth'
-    " Better Syntax Support
-    Plug 'sheerun/vim-polyglot'
     " Treesitter
     Plug 'nvim-treesitter/nvim-treesitter'
-    Plug 'nvim-treesitter/playground'
     " Cool Icons
     Plug 'kyazdani42/nvim-web-devicons'
     Plug 'ryanoasis/vim-devicons'
     " Auto pairs for '(' '[' '{'
     Plug 'jiangmiao/auto-pairs'
-    " Closetags
-    Plug 'alvan/vim-closetag'
-    " Themes
-    Plug 'christianchiarulli/nvcode-color-schemes.vim'
-    " Intellisense
-    Plug 'neoclide/coc.nvim', {'branch': 'release'}
     " Status Line
     Plug 'glepnir/galaxyline.nvim'
+    " Ranger
     Plug 'kevinhwang91/rnvimr'
-    " FZF
-    Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-    " Plug 'yuki-ycino/fzf-preview.vim', { 'branch': 'release', 'do': ':UpdateRemotePlugins' }
-    Plug 'junegunn/fzf.vim'
-    " Git
-    Plug 'airblade/vim-gitgutter'
-    Plug 'tpope/vim-fugitive'
-    Plug 'tpope/vim-rhubarb'
-    Plug 'junegunn/gv.vim'
-    Plug 'rhysd/git-messenger.vim'
     " Terminal
     Plug 'voldikss/vim-floaterm'
     " Start Screen
@@ -84,95 +56,51 @@ call plug#begin('~/.config/nvim/autoload/plugged')
     Plug 'metakirby5/codi.vim'
     " Better tabline
     Plug 'romgrk/barbar.nvim'
-    " undo time travel
-    Plug 'mbbill/undotree'
     " Find and replace
-    " Plug 'ChristianChiarulli/far.vim'
     Plug 'brooth/far.vim'
-    " Auto change html tags
-    Plug 'AndrewRadev/tagalong.vim'
-    " live server
-    Plug 'turbio/bracey.vim'
     " Smooth scroll
     Plug 'psliwka/vim-smoothie'
-    " " async tasks
-    Plug 'skywind3000/asynctasks.vim'
-    Plug 'skywind3000/asyncrun.vim'
-    " Swap windows
-    Plug 'wesQ3/vim-windowswap'
     " Markdown Preview
     Plug 'iamcco/markdown-preview.nvim', { 'do': 'cd app & npm install'  }
-    " Easily Create Gists
-    Plug 'mattn/vim-gist'
-    Plug 'mattn/webapi-vim'
-    " Colorizer
-    Plug 'norcalli/nvim-colorizer.lua'
     " Intuitive buffer closing
     Plug 'moll/vim-bbye'
-    " Debugging
-    Plug 'puremourning/vimspector'
-    Plug 'szw/vim-maximizer'
-    " Neovim in Browser
-    Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(1) } }
     " Telescope
     Plug 'nvim-lua/popup.nvim'
     Plug 'nvim-lua/plenary.nvim'
     Plug 'nvim-telescope/telescope.nvim'
-    " Rainbow brackets
-    " Plug 'luochen1990/rainbow'
-    " Async Linting Engine
-    " TODO make sure to add ale config before plugin
-    " Plug 'dense-analysis/ale'
-    " Better Whitespace
-    " Plug 'ntpeters/vim-better-whitespace'
-    " Multiple Cursors
-    " TODO add this back in change from C-n
-    " Plug 'mg979/vim-visual-multi', {'branch': 'master'}
-    " Plug 'yuezk/vim-js'
-    " Plug 'maxmellon/vim-jsx-pretty'
-    " Plug 'jelera/vim-javascript-syntax'
-    " Plugin Graveyard
+    " Intellisense
+    Plug 'neovim/nvim-lspconfig'
+    Plug 'hrsh7th/nvim-compe'
+    Plug 'glepnir/lspsaga.nvim'
+    Plug 'onsails/lspkind-nvim'
+    Plug 'kosayoda/nvim-lightbulb'
+    " File Explorer
+    Plug 'kyazdani42/nvim-tree.lua'
 
-    " Debug
-    " Plug 'mfussenegger/nvim-dap'
-    " Plug 'nvim-dap-virtual-text'
-    " Sneak
-    " Plug 'justinmk/vim-sneak'
-    " Plug 'nvim-treesitter/nvim-treesitter-refactor'
-    " Plug 'nvim-treesitter/nvim-treesitter-textobjects'
-    " Plug 'romgrk/nvim-treesitter-context'
-    " Minimap
-    " Plug 'wfxr/minimap.vim'
-    " jsx syntax support
-    " Typescript syntax
-    " Plug 'HerringtonDarkholme/yats.vim'
-    " Multiple Cursors
-    " Plug 'terryma/vim-multiple-cursors'
-    " Plug 'kaicataldo/material.vim'
-    " Plug 'tomasiser/vim-code-dark'
-    " Plug 'mg979/vim-xtabline'
-    " Files
-    " Plug 'tpope/vim-eunuch'
-    " Vim Wiki
-    " Plug 'https://github.com/vimwiki/vimwiki.git'
-    " Better Comments
-    " Plug 'jbgutierrez/vim-better-comments'
-    " Echo doc
-    " Plug 'Shougo/echodoc.vim'
-    " Plug 'hardcoreplayers/spaceline.vim'
-    " Plug 'vim-airline/vim-airline'
-    " Plug 'vim-airline/vim-airline-themes'
-    " Ranger
-    " Plug 'francoiscabrol/ranger.vim'
-    " Plug 'rbgrouleff/bclose.vim'
-    " Making stuff
-    " Plug 'neomake/neomake'
-    " Plug 'mhinz/vim-signify'
-    " Plug 'preservim/nerdcommenter'
-    " Plug 'atishay/far.vim'
-    " Plug 'romgrk/lib.kom'
-    " Plug 'brooth/far.vim'
-    " Debugging
+    " Themes
+    Plug 'christianchiarulli/nvcode-color-schemes.vim'
+    " Better Syntax Support
+    Plug 'sheerun/vim-polyglot'
+
+    " Git
+    Plug 'airblade/vim-gitgutter'
+    Plug 'tpope/vim-fugitive'
+    Plug 'tpope/vim-rhubarb'
+    Plug 'junegunn/gv.vim'
+    Plug 'rhysd/git-messenger.vim'
+    " Easily Create Gists
+    Plug 'mattn/vim-gist'
+    Plug 'mattn/webapi-vim'
+
+    " Webdev
+    " Auto change html tags
+    Plug 'AndrewRadev/tagalong.vim'
+    " Closetags
+    Plug 'alvan/vim-closetag'
+    " Colorizer
+    Plug 'norcalli/nvim-colorizer.lua'
+    " live server
+    Plug 'turbio/bracey.vim'
   endif
 
 call plug#end()