diff --git a/lua/gruber-darker.lua b/lua/gruber-darker.lua index e878a94..dd0263c 100644 --- a/lua/gruber-darker.lua +++ b/lua/gruber-darker.lua @@ -22,11 +22,11 @@ local function create_autocmds() }) vim.api.nvim_create_autocmd("FileType", { - group = gruber_darker_group, - pattern = "qf,help", - callback = function() - vim.cmd.setlocal("winhighlight=Normal:NormalSB,SignColumn:SignColumnSB") - end, + group = gruber_darker_group, + pattern = "qf,help", + callback = function() + vim.cmd.setlocal("winhighlight=Normal:NormalSB,SignColumn:SignColumnSB") + end, }) end @@ -41,7 +41,7 @@ function M.load() highlights.setup() - create_autocmds() + create_autocmds() end ---Change colorscheme to GruberDarker diff --git a/lua/gruber-darker/config.lua b/lua/gruber-darker/config.lua index 03a1d77..1a52882 100644 --- a/lua/gruber-darker/config.lua +++ b/lua/gruber-darker/config.lua @@ -14,12 +14,12 @@ local DEFAULTS = { bold = true, italic = { - strings = true, - comments = true, - operators = false, - folds = true, - }, - -- undercurl = true, + strings = true, + comments = true, + operators = false, + folds = true, + }, + -- undercurl = true, underline = true, } @@ -35,11 +35,11 @@ local instance = nil ---@return GruberDarkerOpts ---@nodiscard function ConfigMgr.get_opts() - if instance ~= nil then - return instance.resolved_opts - end + if instance ~= nil then + return instance.resolved_opts + end - return DEFAULTS + return DEFAULTS end ---Set GruberDarker colorscheme options diff --git a/lua/gruber-darker/highlight.lua b/lua/gruber-darker/highlight.lua index c4e5c17..d415af5 100644 --- a/lua/gruber-darker/highlight.lua +++ b/lua/gruber-darker/highlight.lua @@ -59,7 +59,7 @@ end ---Set global highlight for the group this is associated with function Highlight:setup() - vim.api.nvim_set_hl(0, self.group, get_hl_definition_map(self.opts)) + vim.api.nvim_set_hl(0, self.group, get_hl_definition_map(self.opts)) end return Highlight diff --git a/lua/gruber-darker/highlights/init.lua b/lua/gruber-darker/highlights/init.lua index 15e150d..643f7c9 100644 --- a/lua/gruber-darker/highlights/init.lua +++ b/lua/gruber-darker/highlights/init.lua @@ -1,9 +1,9 @@ local M = {} local providers = { - require("gruber-darker.highlights.vim"), - require("gruber-darker.highlights.terminal"), - require("gruber-darker.highlights.treesitter"), + require("gruber-darker.highlights.vim"), + require("gruber-darker.highlights.terminal"), + require("gruber-darker.highlights.treesitter"), } ---Set highlights for configured providers diff --git a/lua/gruber-darker/highlights/vim.lua b/lua/gruber-darker/highlights/vim.lua index 5f478b2..9cbfdda 100644 --- a/lua/gruber-darker/highlights/vim.lua +++ b/lua/gruber-darker/highlights/vim.lua @@ -15,8 +15,7 @@ function M.setup() end ---any comment -M.highlights.comment = - Highlight.new("Comment", { fg = c.default.brown, italic = opts.italic.comments }) +M.highlights.comment = Highlight.new("Comment", { fg = c.default.brown, italic = opts.italic.comments }) ---used for the columns set with 'colorcolumn' M.highlights.color_column = Highlight.new("ColorColumn", { bg = c.default["bg+2"] }) ---placeholder characters substituted for concealed text (see 'conceallevel') @@ -54,7 +53,8 @@ M.highlights.vert_split = Highlight.new("VertSplit", { fg = c.default["fg+2"], b ---the column separating vertically split windows M.highlights.win_separator = Highlight.new("WinSeparator", { fg = c.default["bg+2"], bold = opts.bold }) ---line used for closed folds -M.highlights.folded = Highlight.new("Folded", { fg = c.default.brown, bg = c.default["fg+2"], italic = opts.italic.folds }) +M.highlights.folded = + Highlight.new("Folded", { fg = c.default.brown, bg = c.default["fg+2"], italic = opts.italic.folds }) ---'foldcolumn' M.highlights.fold_column = Highlight.new("FoldColumn", { fg = c.default.brown, bg = c.default["fg+2"] }) ---column where |signs| are displayed @@ -207,8 +207,7 @@ M.highlights.italic = Highlight.new("Italic", { italic = true }) ---(preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX M.highlights.todo = Highlight.new("Todo", { fg = c.default.bg, bg = c.default.yellow }) -M.highlights.md_heading_delim = - Highlight.new("markdownHeadingDelimiter", { fg = c.default.niagara, bold = opts.bold }) +M.highlights.md_heading_delim = Highlight.new("markdownHeadingDelimiter", { fg = c.default.niagara, bold = opts.bold }) M.highlights.md_code = Highlight.new("markdownCode", { fg = c.default.green }) M.highlights.md_code_block = Highlight.new("markdownCodeBlock", { fg = c.default.green }) ---markdownH1 = Highlight.new("markdownH1", { fg = c.magenta, bold = true }) @@ -216,8 +215,7 @@ M.highlights.md_code_block = Highlight.new("markdownCodeBlock", { fg = c.default ---markdownLinkText = Highlight.new("markdownLinkText", { fg = c.blue, underline = true }) M.highlights.md_italic = Highlight.new("markdownItalic", { fg = c.default.wisteria, italic = true }) M.highlights.md_bold = Highlight.new("markdownBold", { fg = c.default.yellow, bold = opts.bold }) -M.highlights.md_code_delim = - Highlight.new("markdownCodeDelimiter", { fg = c.default.brown, italic = true }) +M.highlights.md_code_delim = Highlight.new("markdownCodeDelimiter", { fg = c.default.brown, italic = true }) M.highlights.md_error = Highlight.new("markdownError", { fg = c.default.fg, bg = c.default["bg+1"] }) return M