From dae005f87f91b5ce150629f86f5f376a1f90f253 Mon Sep 17 00:00:00 2001
From: Chris <chrisatmachine@gmail.com>
Date: Mon, 15 Mar 2021 11:54:53 -0400
Subject: updates

---
 README.md             | 10 ++++++++--
 init.lua              |  2 +-
 lua/keymappings.lua   |  2 ++
 lua/lsp/js-ts-ls.lua  |  9 ++++++++-
 lua/nv-compe/init.lua |  2 ++
 lua/plugins.lua       |  4 ++++
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a3a01afd..5e095787 100644
--- a/README.md
+++ b/README.md
@@ -23,15 +23,21 @@ sudo rm -r neovim
 ```
 
 ## TODO
+
+**HIGH PRIORITY**
 - snippet support
+- auto close tags
 - configure git blame
+- react commenting
+- better autoimport
 - add lots of lsp
+- add vscode support
+
+**LOW PRIORITY**
 - move language servers not installed with npm to neovim local share location
-- react commenting
 - update whichkey bindings
 - more handsome/modern galaxyline
 - potentially custom colorscheme
-- add vscode support
 - look into autoinstall lsp
 - get logo
 - configure neogit
diff --git a/init.lua b/init.lua
index 931004ee..efa71fca 100644
--- a/init.lua
+++ b/init.lua
@@ -5,7 +5,6 @@ require('settings')
 require('colorscheme')
 
 -- Plugins
-require('nv-compe')
 require('nv-colorizer')
 require('nv-nvimtree')
 require('nv-treesitter')
@@ -22,6 +21,7 @@ require('nv-floaterm')
 require('nv-vim-rooter')
 require('nv-lspkind')
 require('nv-hop')
+require('nv-compe')
 
 -- Which Key (Hope to replace with Lua plugin someday)
 vim.cmd('source ~/.config/nvim/lua/nv-whichkey/init.vim')
diff --git a/lua/keymappings.lua b/lua/keymappings.lua
index fe910de5..b5a57924 100644
--- a/lua/keymappings.lua
+++ b/lua/keymappings.lua
@@ -59,6 +59,8 @@ vim.api.nvim_set_keymap('x', 'J', ':move \'>+1<CR>gv-gv', { noremap = true, sile
 -- Better nav for omnicomplete
 vim.cmd('inoremap <expr> <c-j> (\"\\<C-n>\")')
 vim.cmd('inoremap <expr> <c-k> (\"\\<C-p>\")')
+-- vim.cmd('inoremap <expr> <TAB> (\"\\<C-n>\")')
+-- vim.cmd('inoremap <expr> <S-TAB> (\"\\<C-p>\")')
 
 -- TAB Complete
 --vim.api.nvim_set_keymap('i', '<expr><TAB>', 'pumvisible() ? \"\\<C-n>\" : \"\\<TAB>\"', { noremap = true, silent = true })
diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua
index 9d35fcbf..a1276d6d 100644
--- a/lua/lsp/js-ts-ls.lua
+++ b/lua/lsp/js-ts-ls.lua
@@ -1,2 +1,9 @@
 -- npm install -g typescript typescript-language-server
-require'lspconfig'.tsserver.setup{}
+require'snippets'.use_suggested_mappings()
+
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true;
+require'lspconfig'.tsserver.setup{
+    capabilities = capabilities,
+    on_attach = on_attach
+}
diff --git a/lua/nv-compe/init.lua b/lua/nv-compe/init.lua
index 4dcfe26a..75fa9b55 100644
--- a/lua/nv-compe/init.lua
+++ b/lua/nv-compe/init.lua
@@ -1,3 +1,5 @@
+vim.o.completeopt = "menuone,noselect"
+
 require'compe'.setup {
   enabled = true;
   autocomplete = true;
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2bd457ca..d54a59db 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -33,6 +33,10 @@ return require('packer').startup(function()
   -- Autocomplete
   use 'hrsh7th/nvim-compe'
   use 'hrsh7th/vim-vsnip'
+  use 'honza/vim-snippets'
+  use 'norcalli/snippets.nvim'
+
+  -- use 'SirVer/ultisnips'
 
   -- Treesitter
   use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
-- 
cgit v1.2.3