diff options
| -rw-r--r-- | lua/config/options.lua | 2 | ||||
| -rw-r--r-- | lua/lualine/theme-monokai.lua | 6 | ||||
| -rw-r--r-- | lua/plugins/colorscheme.lua | 14 | ||||
| -rw-r--r-- | lua/plugins/interface.lua | 83 |
4 files changed, 60 insertions, 45 deletions
diff --git a/lua/config/options.lua b/lua/config/options.lua index ff9d816..65b9071 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -10,7 +10,7 @@ return { vim.opt.updatetime = 250 vim.opt.mouse = '' vim.opt.signcolumn = 'yes' - vim.opt.cursorline = true + --vim.opt.cursorline = true vim.opt.wrap = false vim.opt.splitbelow = true vim.opt.splitright = true diff --git a/lua/lualine/theme-monokai.lua b/lua/lualine/theme-monokai.lua index 91c58a4..855b6c6 100644 --- a/lua/lualine/theme-monokai.lua +++ b/lua/lualine/theme-monokai.lua @@ -27,8 +27,12 @@ monokai_pro.replace = { } monokai_pro.inactive = { - c = { bg = colors.editor.background, fg = colors.base.white }, + c = { bg = colors.editor.background, fg = colors.base.background }, z = { bg = colors.editor.background, fg = colors.base.red }, } +monokai_pro.diagnostics = { + c = { bg = colors.editor.background }, +} + return monokai_pro diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index c7aca2f..aaa319c 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -4,8 +4,8 @@ return { lazy = false, priority = 1000, config = function() - vim.opt.background = 'dark' require('monokai-pro').setup({ + transparent_background = true, override = function(c) return { TelescopeSelection = { bg = c.base.dimmed3 }, @@ -30,6 +30,18 @@ return { }, } end, + overridePalette = function(filter) + return { + accent1 = '#ef476f', + accent2 = '#ff8b09', + accent3 = '#ffd20b', + accent4 = '#06d671', + accent5 = '#00b4d8', + accent6 = '#816cf3', + dimmed3 = '#838383', + dimmed4 = '#838383', + } + end, }) vim.cmd.colorscheme('monokai-pro') end, diff --git a/lua/plugins/interface.lua b/lua/plugins/interface.lua index 42b9252..906dab3 100644 --- a/lua/plugins/interface.lua +++ b/lua/plugins/interface.lua @@ -1,3 +1,4 @@ + return { { 'nvim-tree/nvim-web-devicons', @@ -13,53 +14,51 @@ return { { 'nvim-lualine/lualine.nvim', event = 'VeryLazy', - opts = { - options = { - theme = function() return require('lualine.theme-monokai') end, - }, - sections = { - lualine_a = { - 'mode', + config = function() + require('lualine').setup({ + options = { + component_separators = '', + section_separators = '', + theme = require('lualine.theme-monokai'), }, - lualine_b = { - 'branch', - { - 'diagnostics', - symbols = { - error = ' ', - warn = ' ', - hint = ' ', - info = ' ', + sections = { + lualine_a = { + 'mode', + }, + lualine_b = { + 'branch', + }, + lualine_c = { + { + 'diagnostics', + symbols = { + error = ' ', + warn = ' ', + hint = ' ', + info = ' ', + }, }, }, + lualine_x = {}, + lualine_y = {}, + lualine_z = { + 'buffers', + }, }, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { - 'buffers', - }, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = { - function() - return ' ' - end, - }, - lualine_c = { - 'filename', + inactive_sections = { + lualine_a = {}, + lualine_b = { + function() + return ' ' + end, + }, + lualine_c = { + 'filename', + }, + lualine_x = {}, + lualine_y = {}, + lualine_z = {}, }, - lualine_x = {}, - lualine_y = {}, - lualine_z = {}, - }, - }, - config = function(_, opts) - require('lualine').setup(opts) - vim.api.nvim_set_hl(0, 'StatusLine', { bg = require('monokai-pro.colorscheme').editor.background }) - vim.api.nvim_set_hl(0, 'StatusLineNC', { - bg = require('monokai-pro.colorscheme').editor.backgroundnil }) end, }, |