diff --git a/lazy-lock.json b/lazy-lock.json index e9fa9b2..69a87f9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,7 +12,7 @@ "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" }, "gitmoji.nvim": { "branch": "main", "commit": "326ddf01cbf3425566a089126ece7e8bd2560601" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "gruvbox.nvim": { "branch": "main", "commit": "0940564208a490c173216c3b7d2188b0a5ad3491" }, + "gruvbox-material": { "branch": "master", "commit": "7f56d9f9c4860df528031539d321a61f6e081dee" }, "killersheep.nvim": { "branch": "master", "commit": "506823c47b854df02e78d5fec9468ab0e542dcf5" }, "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, @@ -25,7 +25,7 @@ "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-lspconfig": { "branch": "master", "commit": "fcf153fbbf1facd16a71d46b92be8be495123a9f" }, - "nvim-treesitter": { "branch": "master", "commit": "e9acd01a4a1f6e584f76e736987f4c31401aa4b1" }, + "nvim-treesitter": { "branch": "master", "commit": "93750d388162f5658cfdb77bdcfe80711e637647" }, "nvim-treesitter-context": { "branch": "master", "commit": "bf4d15ee4e96ff5201f16a4ed14443670662eb90" }, "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" }, "plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" }, diff --git a/lua/core.lua b/lua/core.lua index cffc8be..b1a6a3c 100644 --- a/lua/core.lua +++ b/lua/core.lua @@ -11,6 +11,9 @@ o.ruler = true o.scrolloff = 10 o.showmode = false o.spell = true +if vim.fn.has("termguicolors") == 1 then + o.termguicolors = true +end -- controlling global.mapleader = ' ' diff --git a/lua/lazy-plugins.lua b/lua/lazy-plugins.lua index e8e182f..e188a9f 100644 --- a/lua/lazy-plugins.lua +++ b/lua/lazy-plugins.lua @@ -12,9 +12,6 @@ end vim.opt.rtp:prepend(lazypath) local opts = { - install = { - colorscheme = { "gruvbox" } - }, dev = { path = "~/.local/src" } @@ -23,11 +20,15 @@ local opts = { local plugins = { -- main UI { - "ellisonleao/gruvbox.nvim", + "sainnhe/gruvbox-material", lazy = false, priority = 1000, config = function() - vim.cmd([[colorscheme gruvbox]]) + vim.g.gruvbox_material_better_performance = true + vim.g.gruvbox_material_enable_bold = true + vim.g.gruvbox_material_foreground = 1 + vim.g.gruvbox_material_diagnostic_virtual_text = 'colored' + vim.cmd([[colorscheme gruvbox-material]]) end }, { @@ -163,7 +164,6 @@ local plugins = { { "folke/trouble.nvim", lazy = true, - cmd = "Troubletoggle", keys = { vim.keymap.set("n", "xx", function() require("trouble").toggle() end), vim.keymap.set("n", "xw", @@ -179,7 +179,7 @@ local plugins = { vim.keymap.set('n', 'D', function() require("trouble").toggle("lsp_type_definitions") end), - vim.keymap.set('n', 'gd', function () + vim.keymap.set('n', 'gd', function() require("trouble").toggle("lsp_definitions") end), vim.keymap.set('n', 'gi', function() diff --git a/lua/plugins/statusline.lua b/lua/plugins/statusline.lua index 3bb5b1a..95d8c3f 100644 --- a/lua/plugins/statusline.lua +++ b/lua/plugins/statusline.lua @@ -1,7 +1,7 @@ require 'lualine'.setup { options = { icons_enabled = true, - theme = 'gruvbox', + theme = 'gruvbox-material', component_separators = { left = "", right = "|" }, section_separators = "", disabled_filetypes = {}