add support LspInstall where possible

13 files changed, 67 insertions, 36 deletions

diff --git a/README.md b/README.md
index 6a720ec8..6aa76277 100644
--- a/README.md
+++ b/README.md
@@ -151,6 +151,8 @@ To set up your particular debugger, look here:
 **HIGH PRIORITY**
 
 Move user config into `config.lua`
+ts-comment string for react
+update lang-servers to use LspInstall
 
 From here I will update for bug fixes and implement low priority
 features when I have time
@@ -159,7 +161,6 @@ features when I have time
 
 - list all binaries needed for formatters and linters
 - add badges to readme
-- json config file (luajson)
 - Implement what I can from this java config:
   [link](https://github.com/mfussenegger/nvim-jdtls/wiki/Sample-Configurations)
   - better ui for code actions - formatting
@@ -172,10 +173,8 @@ features when I have time
 - what is `fzy`
 - https://github.com/pwntester/octo.nvim
 - configure surround
-- move to ultisnips
+- maybe incorporate ultisnips
 
 **PLUGIN BUGS**
 
 - html snippets are broken with vsnip
-- keep and eye on indent guides plugin for thin lines
-- better auto-import (jsx)
diff --git a/lua/lsp/bash-ls.lua b/lua/lsp/bash-ls.lua
index 723f71ca..9131e9c9 100644
--- a/lua/lsp/bash-ls.lua
+++ b/lua/lsp/bash-ls.lua
@@ -1,2 +1,5 @@
 -- npm i -g bash-language-server
-require'lspconfig'.bashls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.bashls.setup {
+    cmd = {DATA_PATH .. "/lspinstall/bash/node_modules/.bin/bash-language-server", "start"},
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/lua/lsp/css-ls.lua b/lua/lsp/css-ls.lua
index 0da8868d..f68256a4 100644
--- a/lua/lsp/css-ls.lua
+++ b/lua/lsp/css-ls.lua
@@ -1,2 +1,8 @@
 -- npm install -g vscode-css-languageserver-bin
-require'lspconfig'.cssls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.cssls.setup {
+    cmd = {
+        "node", DATA_PATH .. "/lspinstall/css/vscode-css/css-language-features/server/dist/node/cssServerMain.js",
+        "--stdio"
+    },
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/lua/lsp/docker-ls.lua b/lua/lsp/docker-ls.lua
index 96a6babb..b477a239 100644
--- a/lua/lsp/docker-ls.lua
+++ b/lua/lsp/docker-ls.lua
@@ -1,2 +1,6 @@
 -- npm install -g dockerfile-language-server-nodejs
-require'lspconfig'.dockerls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.dockerls.setup {
+    cmd = {DATA_PATH .. "/lspinstall/dockerfile/node_modules/.bin/docker-langserver", "--stdio"},
+    on_attach = require'lsp'.common_on_attach,
+	root_dir = vim.loop.cwd
+}
diff --git a/lua/lsp/efm-general-ls.lua b/lua/lsp/efm-general-ls.lua
index 3b9243a0..23df2c74 100644
--- a/lua/lsp/efm-general-ls.lua
+++ b/lua/lsp/efm-general-ls.lua
@@ -45,6 +45,7 @@ local markdownPandocFormat = {formatCommand = 'pandoc -f markdown -t gfm -sp --t
 
 require"lspconfig".efm.setup {
     -- init_options = {initializationOptions},
+	cmd = { DATA_PATH .. "/lspinstall/efm/efm-langserver" },
     init_options = {documentFormatting = true, codeAction = false},
     filetypes = {"lua", "python", "javascriptreact", "javascript", "sh", "html", "css", "json", "yaml", "markdown"},
     settings = {
diff --git a/lua/lsp/html-ls.lua b/lua/lsp/html-ls.lua
index 94908031..f3027fb8 100644
--- a/lua/lsp/html-ls.lua
+++ b/lua/lsp/html-ls.lua
@@ -2,4 +2,8 @@
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
-require'lspconfig'.html.setup {on_attach = require'lsp'.common_on_attach, capabilities = capabilities}
+require'lspconfig'.html.setup {
+    cmd = {"node", DATA_PATH .. "/lspinstall/html/vscode-html/html-language-features/server/dist/node/htmlServerMain.js", "--stdio"},
+    on_attach = require'lsp'.common_on_attach,
+    capabilities = capabilities
+}
diff --git a/lua/lsp/json-ls.lua b/lua/lsp/json-ls.lua
index 57c13224..952673ac 100644
--- a/lua/lsp/json-ls.lua
+++ b/lua/lsp/json-ls.lua
@@ -1,11 +1,16 @@
 -- npm install -g vscode-json-languageserver
 require'lspconfig'.jsonls.setup {
+    cmd = {
+        "node", DATA_PATH .. "/lspinstall/json/vscode-json/json-language-features/server/dist/node/jsonServerMain.js",
+        "--stdio"
+    },
     on_attach = require'lsp'.common_on_attach,
+
     commands = {
-      Format = {
-        function()
-          vim.lsp.buf.range_formatting({},{0,0},{vim.fn.line("$"),0})
-        end
-      }
+        Format = {
+            function()
+                vim.lsp.buf.range_formatting({}, {0, 0}, {vim.fn.line("$"), 0})
+            end
+        }
     }
 }
diff --git a/lua/lsp/vim-ls.lua b/lua/lsp/vim-ls.lua
index f2dcb79b..39beb119 100644
--- a/lua/lsp/vim-ls.lua
+++ b/lua/lsp/vim-ls.lua
@@ -1,2 +1,5 @@
 -- npm install -g vim-language-server
-require'lspconfig'.vimls.setup {on_attach = require'lsp'.common_on_attach}
+require'lspconfig'.vimls.setup {
+    cmd = {DATA_PATH .. "/lspinstall/vim/node_modules/.bin/vim-language-server", "--stdio"},
+    on_attach = require'lsp'.common_on_attach
+}
diff --git a/lua/lsp/yaml-ls.lua b/lua/lsp/yaml-ls.lua
index e611572b..3fbc41e4 100644
--- a/lua/lsp/yaml-ls.lua
+++ b/lua/lsp/yaml-ls.lua
@@ -1,4 +1,5 @@
 -- npm install -g yaml-language-server
 require'lspconfig'.yamlls.setup{
-    -- on_attach = require'lsp'.common_on_attach,
+	cmd = {DATA_PATH .. "/lspinstall/yaml/node_modules/.bin/yaml-language-server", "--stdio"},
+    on_attach = require'lsp'.common_on_attach,
 }
diff --git a/lua/nv-compe/init.lua b/lua/nv-compe/init.lua
index 76a5361d..3aadf087 100644
--- a/lua/nv-compe/init.lua
+++ b/lua/nv-compe/init.lua
@@ -23,9 +23,10 @@ require'compe'.setup {
         nvim_lua = {kind = "  "},
         spell = {kind = "  "},
         tags = false,
-        snippets_nvim = {kind = "  "},
+        -- snippets_nvim = {kind = "  "},
+        -- ultisnips = {kind = "  "},
         treesitter = {kind = "  "},
-        emoji = {kind = " ﲃ "}
+        emoji = {kind = " ﲃ ", filetypes={"markdown"}}
         -- for emoji press : (idk if that in compe tho)
     }
 }
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2d5729ce..f313d2da 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -44,11 +44,13 @@ return require('packer').startup(function(use)
     use 'ChristianChiarulli/java-snippets'
     use 'ChristianChiarulli/python-snippets'
 
+
     -- Treesitter
     use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
     use 'nvim-treesitter/nvim-treesitter-refactor'
     use 'nvim-treesitter/playground'
     use 'p00f/nvim-ts-rainbow'
+    use { 'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
 
     -- Icons
     use 'kyazdani42/nvim-web-devicons'
@@ -113,10 +115,8 @@ return require('packer').startup(function(use)
     use 'junegunn/goyo.vim'
     use 'andymass/vim-matchup'
     use 'windwp/nvim-autopairs'
-    use 'blackcauldron7/surround.nvim'
 
     -- TODO put this back when stable for indent lines
-    	use { 'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
     	-- vim.g.indent_blankline_space_char = ''
     -- use 'b3nj5m1n/kommentary'
     -- use {
@@ -129,7 +129,12 @@ return require('packer').startup(function(use)
     -- use 'mhinz/vim-startify'
     -- use 'cstrap/python-snippets'
     -- use 'ylcnfrht/vscode-python-snippet-pack'
-    -- use 'SirVer/ultisnips'
     -- use 'norcalli/snippets.nvim'
     -- use {'akinsho/nvim-bufferline.lua', requires = 'kyazdani42/nvim-web-devicons'}
+    -- use 'SirVer/ultisnips'
+    -- use 'honza/vim-snippets'
+    -- vim.g.UltiSnipsExpandTrigger="<CR>"
+    -- vim.g.UltiSnipsJumpForwardTrigger="<Tab>"
+    -- vim.g.UltiSnipsJumpBackwardTrigger="<S-Tab>"
+    -- use 'blackcauldron7/surround.nvim'
 end)
diff --git a/lua/settings.lua b/lua/settings.lua
index ad4a6ec0..40fc24d4 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -3,6 +3,7 @@ vim.cmd('set shortmess+=c') -- Don't pass messages to |ins-completion-menu|.
 vim.o.hidden = true -- Required to keep multiple buffers open multiple buffers
 vim.wo.wrap = false -- Display long lines as just one line
 vim.cmd('set whichwrap+=<,>,[,],h,l') -- move to next line with theses keys
+vim.cmd('syntax on') -- move to next line with theses keys
 vim.o.pumheight = 10 -- Makes popup menu smaller
 vim.o.fileencoding = "utf-8" -- The encoding written to file
 vim.o.cmdheight = 2 -- More space for displaying messages
diff --git a/utils/installer/install.sh b/utils/installer/install.sh
index 5c4c1efe..9ddb30d4 100755
--- a/utils/installer/install.sh
+++ b/utils/installer/install.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 set -o nounset # error when referencing undefined variable
 set -o errexit # exit when command fails
 
@@ -60,18 +62,17 @@ installpynvim() {
 }
 
 installpacker() {
-    git clone https://github.com/wbthomason/packer.nvim\
- ~/.local/share/nvim/site/pack/packer/start/packer.nvim
+	git clone https://github.com/wbthomason/packer.nvim ~/.local/share/nvim/site/pack/packer/start/packer.nvim
 }
 
 cloneconfig() {
 	echo "Cloning NVCode configuration"
 	git clone https://github.com/ChristianChiarulli/nvcode.git ~/.config/nvim
-    mv $HOME/.config/nvim/init.lua $HOME/.config/nvim/init.lua.tmp
-    mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua
+	mv $HOME/.config/nvim/init.lua $HOME/.config/nvim/init.lua.tmp
+	mv $HOME/.config/nvim/utils/init.lua $HOME/.config/nvim/init.lua
 	nvim -u $HOME/.config/nvim/init.lua --headless --noplugin +PackerInstall +qall
-    rm $HOME/.config/nvim/init.lua
-    mv $HOME/.config/nvim/init.lua.tmp $HOME/.config/nvim/init.lua
+	rm $HOME/.config/nvim/init.lua
+	mv $HOME/.config/nvim/init.lua.tmp $HOME/.config/nvim/init.lua
 }
 
 asktoinstallnode() {
@@ -133,24 +134,21 @@ which node >/dev/null && echo "node installed, moving on..." || asktoinstallnode
 # install pynvim
 pip3 list | grep pynvim >/dev/null && echo "pynvim installed, moving on..." || installpynvim
 
-
 if [ -a "$HOME/.local/share/nvim/site/pack/packer/start/packer.nvim" ]; then
-    echo 'packer already installed'
+	echo 'packer already installed'
 else
-    installpacker
+	installpacker
 fi
 
 if [ -a "$HOME/.config/nvcode/init.lua" ]; then
-    echo 'nvcode already installed'
+	echo 'nvcode already installed'
 else
-    # clone config down
-    cloneconfig
-    echo 'export PATH=$HOME/.config/nvcode/utils/bin:$PATH' >>~/.zshrc
-    echo 'export PATH=$HOME/.config/nvcode/utils/bin:$PATH' >>~/.bashrc
+	# clone config down
+	cloneconfig
+	echo 'export PATH=$HOME/.config/nvcode/utils/bin:$PATH' >>~/.zshrc
+	echo 'export PATH=$HOME/.config/nvcode/utils/bin:$PATH' >>~/.bashrc
 fi
 
-
-
 echo "I recommend you also install and activate a font from here: https://github.com/ryanoasis/nerd-fonts"
 
 echo "I also recommend you add 'set preview_images_method ueberzug' to ~/.config/ranger/rc.conf"