From 87cf319118e78c36ff50a4523bbe5d75c41d3f54 Mon Sep 17 00:00:00 2001 From: Lucas Barbieri Date: Fri, 4 Aug 2023 18:39:58 -0300 Subject: [PATCH] switch back to the better neosolarized theme :) --- lua/custom/plugins/neosolarized.lua | 68 +++++++++++++++++++++++++++++ lua/custom/plugins/solarized.lua | 28 ++++++------ 2 files changed, 82 insertions(+), 14 deletions(-) create mode 100644 lua/custom/plugins/neosolarized.lua diff --git a/lua/custom/plugins/neosolarized.lua b/lua/custom/plugins/neosolarized.lua new file mode 100644 index 0000000..509112c --- /dev/null +++ b/lua/custom/plugins/neosolarized.lua @@ -0,0 +1,68 @@ +return { + "svrana/neosolarized.nvim", + priority = 1000, + dependencies = { "tjdevries/colorbuddy.vim" }, + config = function() + local status, n = pcall(require, "neosolarized") + if (not status) then return end + + vim.o.termguicolors = true + + n.setup({ + comment_italics = true, + }) + + local cb = require('colorbuddy.init') + local Color = cb.Color + local colors = cb.colors + local Group = cb.Group + local groups = cb.groups + local styles = cb.styles + + Color.new('white', '#ffffff') + Color.new('black', '#000000') + Group.new('CursorLine', colors.none, colors.base03, styles.NONE, colors.base1) + Group.new('CursorLineNr', colors.yellow, colors.black, styles.NONE, colors.base1) + Group.new('Visual', colors.none, colors.base03, styles.reverse) + + local cError = groups.Error.fg + local cInfo = groups.Information.fg + local cWarn = groups.Warning.fg + local cHint = groups.Hint.fg + + Group.link("@lsp.type.type", groups.Type) + Group.link("@lsp.type.class", groups.Type) + Group.link("@lsp.type.enum", groups.Type) + Group.link("@lsp.type.interface", groups.Type) + Group.link("@lsp.type.struct", groups.Type) + Group.link("@lsp.type.typeParameter", groups.Type) + Group.link("@lsp.type.parameter", groups.Special) + Group.link("@lsp.type.variable", groups.TSVariable) + Group.link("@lsp.type.property", groups.TSProperty) + Group.link("@lsp.type.enumMember", groups.TSProperty) + Group.link("@lsp.type.events", groups.Label) + Group.link("@lsp.type.function", groups.Function) + Group.link("@lsp.type.method", groups.TSMethod) + Group.link("@lsp.type.keyword", groups.Keyword) + Group.link("@lsp.type.modifier", groups.Operator) + Group.link("@lsp.type.comment", groups.Comment) + Group.link("@lsp.type.string", groups.String) + Group.link("@lsp.type.number", groups.Number) + Group.link("@lsp.type.regexp", groups.TSStringRegex) + Group.link("@lsp.type.operator", groups.Operator) + + Group.new("DiagnosticVirtualTextError", cError, cError:dark():dark():dark():dark(), styles.NONE) + Group.new("DiagnosticVirtualTextInfo", cInfo, cInfo:dark():dark():dark(), styles.NONE) + Group.new("DiagnosticVirtualTextWarn", cWarn, cWarn:dark():dark():dark(), styles.NONE) + Group.new("DiagnosticVirtualTextHint", cHint, cHint:dark():dark():dark(), styles.NONE) + Group.new("DiagnosticUnderlineError", colors.none, colors.none, styles.undercurl, cError) + Group.new("DiagnosticUnderlineWarn", colors.none, colors.none, styles.undercurl, cWarn) + Group.new("DiagnosticUnderlineInfo", colors.none, colors.none, styles.undercurl, cInfo) + Group.new("DiagnosticUnderlineHint", colors.none, colors.none, styles.undercurl, cHint) + Group.new("Macro", groups.PreProc, colors.none, styles.italic + styles.bold) + Group.link("Function", groups.Function, colors.none, styles.italic) + Group.new("Conditional", groups.Statement, colors.none, styles.italic) + Group.new("Boolean", groups.Constant, colors.none, styles.bold) + Group.new("HoverBorder", colors.yellow, colors.none, styles.NONE) + end +} diff --git a/lua/custom/plugins/solarized.lua b/lua/custom/plugins/solarized.lua index 7b380f4..e6fcada 100644 --- a/lua/custom/plugins/solarized.lua +++ b/lua/custom/plugins/solarized.lua @@ -1,18 +1,18 @@ return { - 'maxmx03/solarized.nvim', - lazy = false, - priority = 1000, - config = function() - vim.o.background = 'dark' -- or 'light' - require('solarized').setup({ - transparent = true, - theme = 'neo', - styles = { - functions = { bold = true, italic = false } - }, - }) - vim.cmd.colorscheme 'solarized' - end, + -- 'maxmx03/solarized.nvim', + -- lazy = false, + -- priority = 1000, + -- config = function() + -- vim.o.background = 'dark' -- or 'light' + -- require('solarized').setup({ + -- transparent = true, + -- theme = 'neo', + -- styles = { + -- functions = { bold = true, italic = false } + -- }, + -- }) + -- vim.cmd.colorscheme 'solarized' + -- end, } -- vim: sw=2 ts=2 sts=2 et