diff --git a/init.lua b/init.lua index 632ae3a..f72f074 100644 --- a/init.lua +++ b/init.lua @@ -13,7 +13,6 @@ end vim.opt.rtp:prepend(lazypath) vim.opt.termguicolors = true - -- load all plugins require("lazy-load") -- load general config diff --git a/lua/general.lua b/lua/general.lua index 2b23e9b..b4a1775 100644 --- a/lua/general.lua +++ b/lua/general.lua @@ -39,5 +39,6 @@ vim.opt.cursorline = true vim.cmd [[ highlight clear colorscheme dracula + TSEnable highlight ]] diff --git a/lua/lazy-load.lua b/lua/lazy-load.lua index ccca78b..8fa6299 100644 --- a/lua/lazy-load.lua +++ b/lua/lazy-load.lua @@ -5,9 +5,14 @@ require("lazy").setup({ config = require('plugins.nvim-tree').config, keys = require('plugins.nvim-tree').keys }, + { 'nvim-treesitter/nvim-treesitter', + config = require('plugins.treesitter').config, + build = ':TSUpdate', + priority = 200}, -- neovim lsp plugins and depencencies { 'neovim/nvim-lspconfig', - init = require('plugins.nvim-lspconfig').init }, + init = require('plugins.nvim-lspconfig').init, + priority = 100}, { 'hrsh7th/cmp-nvim-lsp' }, { 'hrsh7th/cmp-buffer' }, { 'hrsh7th/cmp-cmdline' }, @@ -71,7 +76,8 @@ require("lazy").setup({ -- themes { 'olimorris/onedarkpro.nvim' }, { 'ellisonleao/gruvbox.nvim' }, - { 'Mofiqul/dracula.nvim' }, + { 'Mofiqul/dracula.nvim', + priority = 300}, { 'vigoux/oak' }, { 'NLKNguyen/papercolor-theme' }, { 'bluz71/vim-moonfly-colors' }, @@ -94,9 +100,6 @@ require("lazy").setup({ }, { 'BurntSushi/ripgrep' }, - { 'nvim-treesitter/nvim-treesitter', - config = require('plugins.treesitter').config, - build = ':TSUpdate' }, }, { diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 49ec4bd..5496287 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -38,7 +38,7 @@ return { -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). -- Using this option may slow down your editor, and you may see some duplicate highlights. -- Instead of true it can also be a list of languages - additional_vim_regex_highlighting = true, -- default=false + additional_vim_regex_highlighting = false, -- default=false }, } }