better vscode support

1 files changed, 51 insertions, 57 deletions

diff --git a/init.lua b/init.lua
index b7fda460..298683e3 100644
--- a/init.lua
+++ b/init.lua
@@ -1,61 +1,55 @@
--- vim.cmd('set rtp+=~/.config/nvcode')
-if vim.g.vscode then
-  vim.cmd('source ~/.config/nvim/vimscript/nv-vscode/init.vim')
-  require('settings')
-  require('nv-quickscope')
-else
-  -- General mappings
-  require('plugins')
-  require('nv-utils')
-  require('settings')
-  require('keymappings')
-  require('colorscheme')
-  require('nv-galaxyline')
+-- General mappings
+require('plugins')
+require('nv-utils')
+require('settings')
+require('keymappings')
+require('colorscheme')
+require('nv-galaxyline')
 
-  -- Plugins
-  require('nv-compe')
-  require('nv-colorizer')
-  require('nv-nvimtree')
-  require('nv-treesitter')
-  require('nv-barbar')
-  require('nv-emmet')
-  require('nv-quickscope')
-  require('nv-gitsigns')
-  require('nv-nvim-autopairs')
-  require('nv-illuminate')
-  require('nv-neogit')
-  require('nv-comment')
-  require('nv-rnvimr')
-  require('nv-telescope')
-  require('nv-floaterm')
-  require('nv-vim-rooter')
-  require('nv-matchup')
-  require('nv-lspkind')
-  require('nv-hop')
-  require('nv-gitblame')
-  require('nv-nvim-peekup')
-  require('nv-dashboard')
-  require('nv-dial')
+-- Plugins
+require('nv-compe')
+require('nv-colorizer')
+require('nv-nvimtree')
+require('nv-treesitter')
+require('nv-barbar')
+require('nv-emmet')
+require('nv-quickscope')
+require('nv-gitsigns')
+require('nv-nvim-autopairs')
+require('nv-illuminate')
+require('nv-neogit')
+require('nv-comment')
+require('nv-rnvimr')
+require('nv-telescope')
+require('nv-floaterm')
+require('nv-vim-rooter')
+require('nv-matchup')
+require('nv-lspkind')
+require('nv-hop')
+require('nv-gitblame')
+require('nv-nvim-peekup')
+require('nv-dashboard')
+require('nv-dial')
+require('nv-nvim-dap')
+require('nv-lightbulb')
 
-  -- Which Key (Hope to replace with Lua plugin someday)
-  vim.cmd('source ~/.config/nvim/vimscript/nv-whichkey/init.vim')
-  vim.cmd('source ~/.config/nvim/vimscript/functions.vim')
-
-  -- LSP
-  require('lsp')
-  require('lsp.lua-ls')
-  require('lsp.bash-ls')
-  require('lsp.js-ts-ls')
-  require('lsp.python-ls')
-  require('lsp.json-ls')
-  require('lsp.yaml-ls')
-  require('lsp.vim-ls')
-  require('lsp.graphql-ls')
-  require('lsp.css-ls')
-  require('lsp.docker-ls')
-  require('lsp.html-ls')
-  require('lsp.efm-general-ls')
-  require('lsp.virtual_text')
-end
+-- Which Key (Hope to replace with Lua plugin someday)
+vim.cmd('source ~/.config/nvim/vimscript/nv-whichkey/init.vim')
+vim.cmd('source ~/.config/nvim/vimscript/functions.vim')
 
+-- LSP
+require('lsp')
+require('lsp.lua-ls')
+require('lsp.bash-ls')
+require('lsp.js-ts-ls')
+require('lsp.python-ls')
+require('lsp.json-ls')
+require('lsp.yaml-ls')
+require('lsp.vim-ls')
+require('lsp.graphql-ls')
+require('lsp.css-ls')
+require('lsp.docker-ls')
+require('lsp.html-ls')
+require('lsp.efm-general-ls')
+require('lsp.virtual_text')