Updates to nvim

1 files changed, 26 insertions, 37 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index c10ec24..5c44697 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -1,51 +1,40 @@
--- General mappings
 require('plugins')
-require('mappings')
+require('globals')
+require('_utils')
+vim.cmd('luafile ~/.config/nvim/language-settings.lua')
+require('_autocommands')
 require('settings')
+require('mappings')
 require('colorscheme')
-require('_utils')
-
--- Plugins
+require('_galaxyline')
+require('_comment')
 require('_compe')
+require('_barbar')
+require('_dashboard')
 require('_telescope')
-require('_autopairs')
-require('_closetag')
-require('_colorizer')
-require('_comment')
-require('_floaterm')
-require('_gitblame')
 require('_gitsigns')
-require('_hop')
-require('_illuminate')
-require('_matchup')
-require('_neogit')
 require('_nvimtree')
-require('_quickscope')
-require('_rnvimr')
-require('_startify')
 require('_treesitter')
-require('_vim-rooter')
+require('_autopairs')
+require('_rnvimr')
 require('_vim-bbye')
-require('_vim-pydocstring')
-require('_peekup')
-
--- bufferline and statusline
-require('_galaxyline')
-require('_bufferline')
+require('_vim-rooter')
+require('_neogit')
 
--- Load vim scripts
 -- Which Key (Hope to replace with Lua plugin someday)
-vim.cmd('source ~/.config/nvim/vim-script/_goyo/init.vim')
-vim.cmd('source ~/.config/nvim/vim-script/_limelight/init.vim')
 vim.cmd('source ~/.config/nvim/vim-script/_whichkey/init.vim')
+vim.cmd('source ~/.config/nvim/vim-script/functions.vim')
 
 -- LSP
-require('_lspkind')
-require('_lsp')
-require('_lsp.bash-ls')
-require('_lsp.docker-ls')
-require('_lsp.lua-ls')
-require('_lsp.json-ls')
-require('_lsp.vim-ls')
-require('_lsp.python-ls')
-require('_lsp.yaml-ls')
+require('lsp')
+require('lsp.clangd')
+require('lsp.lua-ls')
+require('lsp.bash-ls')
+require('lsp.python-ls')
+require('lsp.rust-ls')
+require('lsp.json-ls')
+require('lsp.yaml-ls')
+require('lsp.vim-ls')
+require('lsp.docker-ls')
+require('lsp.emmet-ls')
+require('lsp.efm-general-ls')