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

---
 init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'init.lua')

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')
-- 
cgit v1.2.3


From 8f10e3cf3d271e827d65823d79db76da944c29d8 Mon Sep 17 00:00:00 2001
From: Chris <chrisatmachine@gmail.com>
Date: Mon, 15 Mar 2021 12:14:48 -0400
Subject: auto close tags

---
 init.lua | 1 +
 1 file changed, 1 insertion(+)

(limited to 'init.lua')

diff --git a/init.lua b/init.lua
index efa71fca..b142181a 100644
--- a/init.lua
+++ b/init.lua
@@ -22,6 +22,7 @@ require('nv-vim-rooter')
 require('nv-lspkind')
 require('nv-hop')
 require('nv-compe')
+require('nv-closetag')
 
 -- Which Key (Hope to replace with Lua plugin someday)
 vim.cmd('source ~/.config/nvim/lua/nv-whichkey/init.vim')
-- 
cgit v1.2.3


From d9c899652bdc29aa99ea5c2582bdc49d01655a4f Mon Sep 17 00:00:00 2001
From: Chris <chrisatmachine@gmail.com>
Date: Mon, 15 Mar 2021 12:34:37 -0400
Subject: add git blame plugin

---
 init.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'init.lua')

diff --git a/init.lua b/init.lua
index b142181a..918e0710 100644
--- a/init.lua
+++ b/init.lua
@@ -23,6 +23,7 @@ require('nv-lspkind')
 require('nv-hop')
 require('nv-compe')
 require('nv-closetag')
+require('nv-gitblame')
 
 -- Which Key (Hope to replace with Lua plugin someday)
 vim.cmd('source ~/.config/nvim/lua/nv-whichkey/init.vim')
@@ -33,4 +34,4 @@ require('utils')
 require('lsp.lua-ls')
 require('lsp.bash-ls')
 require('lsp.js-ts-ls')
-
+vim.cmd('highlight default link gitblame SpecialComment')
-- 
cgit v1.2.3


From 570e143562b382d82b3e691cafe7bdf0f2d25160 Mon Sep 17 00:00:00 2001
From: Chris <chrisatmachine@gmail.com>
Date: Mon, 15 Mar 2021 12:58:57 -0400
Subject: support vscode

---
 init.lua | 71 +++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

(limited to 'init.lua')

diff --git a/init.lua b/init.lua
index 918e0710..6823db04 100644
--- a/init.lua
+++ b/init.lua
@@ -1,37 +1,40 @@
--- General mappings
-require('plugins')
-require('keymappings')
-require('settings')
-require('colorscheme')
+if vim.g.vscode then
+  vim.cmd('source ~/.config/nvim/lua/nv-vscode/init.vim')
+else
+  -- General mappings
+  require('plugins')
+  require('keymappings')
+  require('settings')
+  require('colorscheme')
 
--- Plugins
-require('nv-colorizer')
-require('nv-nvimtree')
-require('nv-treesitter')
-require('nv-galaxyline')
-require('nv-barbar')
-require('nv-gitsigns')
-require('nv-nvim-autopairs')
-require('nv-kommentary')
-require('nv-quickscope')
-require('nv-rnvimr')
-require('nv-startify')
-require('nv-telescope')
-require('nv-floaterm')
-require('nv-vim-rooter')
-require('nv-lspkind')
-require('nv-hop')
-require('nv-compe')
-require('nv-closetag')
-require('nv-gitblame')
+  -- Plugins
+  require('nv-colorizer')
+  require('nv-nvimtree')
+  require('nv-treesitter')
+  require('nv-galaxyline')
+  require('nv-barbar')
+  require('nv-gitsigns')
+  require('nv-nvim-autopairs')
+  require('nv-kommentary')
+  require('nv-quickscope')
+  require('nv-rnvimr')
+  require('nv-startify')
+  require('nv-telescope')
+  require('nv-floaterm')
+  require('nv-vim-rooter')
+  require('nv-lspkind')
+  require('nv-hop')
+  require('nv-compe')
+  require('nv-closetag')
+  require('nv-gitblame')
 
--- Which Key (Hope to replace with Lua plugin someday)
-vim.cmd('source ~/.config/nvim/lua/nv-whichkey/init.vim')
+  -- Which Key (Hope to replace with Lua plugin someday)
+  vim.cmd('source ~/.config/nvim/lua/nv-whichkey/init.vim')
 
--- LSP
-require('lsp')
-require('utils')
-require('lsp.lua-ls')
-require('lsp.bash-ls')
-require('lsp.js-ts-ls')
-vim.cmd('highlight default link gitblame SpecialComment')
+  -- LSP
+  require('lsp')
+  require('utils')
+  require('lsp.lua-ls')
+  require('lsp.bash-ls')
+  require('lsp.js-ts-ls')
+end
-- 
cgit v1.2.3