diff --git a/lua/plugins/auto-complete.lua b/lua/plugins/auto-complete.lua index 82a1e6c..f90063f 100644 --- a/lua/plugins/auto-complete.lua +++ b/lua/plugins/auto-complete.lua @@ -10,7 +10,6 @@ return { }, config = function() local cmp = require("cmp") - cmp.setup({ snippet = { expand = function(args) @@ -36,6 +35,14 @@ return { }, { "neovim/nvim-lspconfig" + }, + { + "nvim-treesitter/nvim-treesitter", + config = function() + require('nvim-treesitter.configs').setup { + ensure_installed = { 'c', 'cpp', 'cmake', 'bash', 'go', 'lua', 'python', 'java', 'git_config', 'git_rebase', 'gitattributes', 'gitcommit', 'gitignore', 'groovy', 'json', 'sql', 'vim', 'xml', 'tcl'}, + } + end, } } diff --git a/lua/plugins/markdown.lua b/lua/plugins/markdown.lua index 953cd35..9058ab2 100644 --- a/lua/plugins/markdown.lua +++ b/lua/plugins/markdown.lua @@ -5,6 +5,5 @@ return { build = function() vim.fn["mkdp#util#install"]() end, - lazy = true; } diff --git a/lua/plugins/plugin-base.lua b/lua/plugins/plugin-base.lua index 7694bf1..e8e3b42 100644 --- a/lua/plugins/plugin-base.lua +++ b/lua/plugins/plugin-base.lua @@ -1,7 +1,6 @@ return { { "nathom/filetype.nvim", - lazy = true, event = "User FileOpened", config = function() require("filetype").setup({ @@ -16,7 +15,6 @@ return { { "HiPhish/nvim-ts-rainbow2", -- Bracket pair rainbow colorize - lazy = true, event = { "User FileOpened" }, }, { @@ -40,7 +38,6 @@ return { }, { "windwp/nvim-spectre", - lazy = true, cmd = { "Spectre" }, config = function() require("spectre").setup() @@ -49,7 +46,6 @@ return { { "andymass/vim-matchup", -- Highlight, jump between pairs like if..else - lazy = true, event = { "User FileOpened" }, config = function() vim.g.matchup_matchparen_offscreen = { method = "popup" } @@ -84,7 +80,6 @@ return { { "folke/noice.nvim", enabled = ENABLE_NOICE, - lazy = true, event = { "BufRead", "BufNewFile" }, dependencies = { "rcarriga/nvim-notify", "MunifTanjim/nui.nvim" }, config = function() @@ -115,10 +110,9 @@ return { }) end, }, - { "lukas-reineke/cmp-under-comparator", lazy = true }, + { "lukas-reineke/cmp-under-comparator" }, { "ray-x/cmp-treesitter", - lazy = true, }, { 'nvim-lualine/lualine.nvim', @@ -138,7 +132,6 @@ return { }, { "tiagovla/scope.nvim", - lazy = false }, { "akinsho/bufferline.nvim", @@ -162,6 +155,7 @@ return { { "azabiong/vim-highlighter", }, - {"stevearc/dressing.nvim", opts = {}} + {"stevearc/dressing.nvim", + opts = {}} } diff --git a/lua/plugins/plugin-git.lua b/lua/plugins/plugin-git.lua index 43e2865..18878a0 100644 --- a/lua/plugins/plugin-git.lua +++ b/lua/plugins/plugin-git.lua @@ -1,20 +1,6 @@ return { -{ + { "tpope/vim-fugitive", - cmd = { - "G", - "Git", - "Gdiffsplit", - "Gread", - "Gwrite", - "Ggrep", - "GMove", - "GDelete", - "GBrowse", - "GRemove", - "GRename", - "Glgrep", - "Gedit" - } } } + diff --git a/lua/plugins/themes.lua b/lua/plugins/themes.lua index b165968..d2bf59f 100644 --- a/lua/plugins/themes.lua +++ b/lua/plugins/themes.lua @@ -4,8 +4,7 @@ return { }, { "Mofiqul/vscode.nvim", - lazy = false, -- make sure we load this during startup if it is your main colorscheme - priority = 1000, -- make sure to load this before all the other start plugins + lazy=false, config = function() require('vscode').setup({ })