From decc826a2fb93b6793b0db1e915b5c27ff01708a Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sat, 22 Jan 2022 18:44:10 +0100 Subject: chore(format): format all files with stylua --- lua/lualine/themes/no-clown-fiesta.lua | 58 +++++----- lua/no-clown-fiesta/Git.lua | 12 +-- lua/no-clown-fiesta/Hop.lua | 8 +- lua/no-clown-fiesta/LSP.lua | 76 ++++++------- lua/no-clown-fiesta/NvimTree.lua | 60 +++++------ lua/no-clown-fiesta/Packer.lua | 0 lua/no-clown-fiesta/StatusLine.lua | 10 +- lua/no-clown-fiesta/Telescope.lua | 8 +- lua/no-clown-fiesta/Treesitter.lua | 104 +++++++++--------- lua/no-clown-fiesta/Whichkey.lua | 10 +- lua/no-clown-fiesta/config.lua | 24 ++--- lua/no-clown-fiesta/highlights.lua | 190 ++++++++++++++++----------------- lua/no-clown-fiesta/init.lua | 54 +++++----- lua/no-clown-fiesta/markdown.lua | 46 ++++---- lua/no-clown-fiesta/palette.lua | 60 +++++------ lua/no-clown-fiesta/util.lua | 28 ++--- 16 files changed, 374 insertions(+), 374 deletions(-) create mode 100644 lua/no-clown-fiesta/Packer.lua diff --git a/lua/lualine/themes/no-clown-fiesta.lua b/lua/lualine/themes/no-clown-fiesta.lua index e6ef81f..46679f3 100644 --- a/lua/lualine/themes/no-clown-fiesta.lua +++ b/lua/lualine/themes/no-clown-fiesta.lua @@ -1,36 +1,36 @@ -- Colorscheme for lualine local colors = { - bg = "#171717", - fg = "#D0D0D0", - grey = "#D0D0D0", - blue = "#569CD6", - green = "#608B4E", - yellow = "#DCDCAA", - orange = "#FF8800", - purple = "#C586C0", - magenta = "#D16D9E", - cyan = "#4EC9B0", - red = "#D16969", - error_red = "#F44747", - warning_orange = "#FF8800", - info_yellow = "#FFCC66", - hint_blue = "#9CDCFE", + bg = "#171717", + fg = "#D0D0D0", + grey = "#D0D0D0", + blue = "#569CD6", + green = "#608B4E", + yellow = "#DCDCAA", + orange = "#FF8800", + purple = "#C586C0", + magenta = "#D16D9E", + cyan = "#4EC9B0", + red = "#D16969", + error_red = "#F44747", + warning_orange = "#FF8800", + info_yellow = "#FFCC66", + hint_blue = "#9CDCFE", } return { - normal = { - a = { fg = colors.fg, bg = colors.bg, gui = "bold" }, - b = { fg = colors.fg, bg = colors.bg }, - c = { fg = colors.fg, bg = colors.bg }, - }, - insert = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, - visual = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, - command = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, - replace = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, - inactive = { - a = { fg = colors.fg, bg = colors.bg }, - b = { fg = colors.fg, bg = colors.bg }, - c = { fg = colors.fg, bg = colors.bg }, - }, + normal = { + a = { fg = colors.fg, bg = colors.bg, gui = "bold" }, + b = { fg = colors.fg, bg = colors.bg }, + c = { fg = colors.fg, bg = colors.bg }, + }, + insert = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, + visual = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, + command = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, + replace = { a = { fg = colors.fg, bg = colors.bg, gui = "bold" } }, + inactive = { + a = { fg = colors.fg, bg = colors.bg }, + b = { fg = colors.fg, bg = colors.bg }, + c = { fg = colors.fg, bg = colors.bg }, + }, } diff --git a/lua/no-clown-fiesta/Git.lua b/lua/no-clown-fiesta/Git.lua index a7197b8..b47ccf2 100644 --- a/lua/no-clown-fiesta/Git.lua +++ b/lua/no-clown-fiesta/Git.lua @@ -1,10 +1,10 @@ local Git = { - SignAdd = { fg = C.sign_add }, - SignChange = { fg = C.sign_change }, - SignDelete = { fg = C.sign_delete }, - GitSignsAdd = { fg = C.sign_add }, - GitSignsChange = { fg = C.sign_change }, - GitSignsDelete = { fg = C.sign_delete }, + SignAdd = { fg = C.sign_add }, + SignChange = { fg = C.sign_change }, + SignDelete = { fg = C.sign_delete }, + GitSignsAdd = { fg = C.sign_add }, + GitSignsChange = { fg = C.sign_change }, + GitSignsDelete = { fg = C.sign_delete }, } return Git diff --git a/lua/no-clown-fiesta/Hop.lua b/lua/no-clown-fiesta/Hop.lua index 2b057d1..1e8d8cd 100644 --- a/lua/no-clown-fiesta/Hop.lua +++ b/lua/no-clown-fiesta/Hop.lua @@ -1,8 +1,8 @@ local Hop = { - HopNextKey = { fg = C.cyan, style = "bold" }, - HopNextKey1 = { fg = C.red, style = "bold" }, - HopNextKey2 = { fg = C.gray_blue }, - HopUnmatched = { fg = C.gray }, + HopNextKey = { fg = C.cyan, style = "bold" }, + HopNextKey1 = { fg = C.red, style = "bold" }, + HopNextKey2 = { fg = C.gray_blue }, + HopUnmatched = { fg = C.gray }, } return Hop diff --git a/lua/no-clown-fiesta/LSP.lua b/lua/no-clown-fiesta/LSP.lua index aa57532..6ba9d91 100644 --- a/lua/no-clown-fiesta/LSP.lua +++ b/lua/no-clown-fiesta/LSP.lua @@ -1,42 +1,42 @@ local LSP = { - LspDiagnosticsDefaultError = { fg = C.error_red }, - LspDiagnosticsDefaultWarning = { fg = C.warning_orange }, - LspDiagnosticsDefaultInformation = { fg = C.info_yellow }, - LspDiagnosticsDefaultInfo = { fg = C.info_yellow }, - LspDiagnosticsDefaultHint = { fg = C.hint_blue }, - LspDiagnosticsVirtualTextError = { fg = C.error_red }, - LspDiagnosticsVirtualTextWarning = { fg = C.warning_orange }, - LspDiagnosticsVirtualTextInformation = { fg = C.info_yellow }, - LspDiagnosticsVirtualTextInfo = { fg = C.info_yellow }, - LspDiagnosticsVirtualTextHint = { fg = C.hint_blue }, - LspDiagnosticsFloatingError = { fg = C.error_red }, - LspDiagnosticsFloatingWarning = { fg = C.warning_orange }, - LspDiagnosticsFloatingInformation = { fg = C.info_yellow }, - LspDiagnosticsFloatingInfo = { fg = C.info_yellow }, - LspDiagnosticsFloatingHint = { fg = C.hint_blue }, - DiagnosticSignError = { fg = C.error_red }, - DiagnosticSignWarning = { fg = C.warning_orange }, - DiagnosticSignInformation = { fg = C.info_yellow }, - DiagnosticSignInfo = { fg = C.info_yellow }, - DiagnosticSignHint = { fg = C.hint_blue }, - LspDiagnosticsSignError = { fg = C.error_red }, - LspDiagnosticsSignWarning = { fg = C.warning_orange }, - LspDiagnosticsSignInformation = { fg = C.info_yellow }, - LspDiagnosticsSignInfo = { fg = C.info_yellow }, - LspDiagnosticsSignHint = { fg = C.hint_blue }, - LspDiagnosticsError = { fg = C.error_red }, - LspDiagnosticsWarning = { fg = C.warning_orange }, - LspDiagnosticsInformation = { fg = C.info_yellow }, - LspDiagnosticsInfo = { fg = C.info_yellow }, - LspDiagnosticsHint = { fg = C.hint_blue }, - LspDiagnosticsUnderlineError = { style = "underline" }, - LspDiagnosticsUnderlineWarning = { style = "underline" }, - LspDiagnosticsUnderlineInformation = { style = "underline" }, - LspDiagnosticsUnderlineInfo = { style = "underline" }, - LspDiagnosticsUnderlineHint = { style = "underline" }, - LspReferenceRead = { bg = "#36383F" }, - LspReferenceText = { bg = "#36383F" }, - LspReferenceWrite = { bg = "#36383f" }, + LspDiagnosticsDefaultError = { fg = C.error_red }, + LspDiagnosticsDefaultWarning = { fg = C.warning_orange }, + LspDiagnosticsDefaultInformation = { fg = C.info_yellow }, + LspDiagnosticsDefaultInfo = { fg = C.info_yellow }, + LspDiagnosticsDefaultHint = { fg = C.hint_blue }, + LspDiagnosticsVirtualTextError = { fg = C.error_red }, + LspDiagnosticsVirtualTextWarning = { fg = C.warning_orange }, + LspDiagnosticsVirtualTextInformation = { fg = C.info_yellow }, + LspDiagnosticsVirtualTextInfo = { fg = C.info_yellow }, + LspDiagnosticsVirtualTextHint = { fg = C.hint_blue }, + LspDiagnosticsFloatingError = { fg = C.error_red }, + LspDiagnosticsFloatingWarning = { fg = C.warning_orange }, + LspDiagnosticsFloatingInformation = { fg = C.info_yellow }, + LspDiagnosticsFloatingInfo = { fg = C.info_yellow }, + LspDiagnosticsFloatingHint = { fg = C.hint_blue }, + DiagnosticSignError = { fg = C.error_red }, + DiagnosticSignWarning = { fg = C.warning_orange }, + DiagnosticSignInformation = { fg = C.info_yellow }, + DiagnosticSignInfo = { fg = C.info_yellow }, + DiagnosticSignHint = { fg = C.hint_blue }, + LspDiagnosticsSignError = { fg = C.error_red }, + LspDiagnosticsSignWarning = { fg = C.warning_orange }, + LspDiagnosticsSignInformation = { fg = C.info_yellow }, + LspDiagnosticsSignInfo = { fg = C.info_yellow }, + LspDiagnosticsSignHint = { fg = C.hint_blue }, + LspDiagnosticsError = { fg = C.error_red }, + LspDiagnosticsWarning = { fg = C.warning_orange }, + LspDiagnosticsInformation = { fg = C.info_yellow }, + LspDiagnosticsInfo = { fg = C.info_yellow }, + LspDiagnosticsHint = { fg = C.hint_blue }, + LspDiagnosticsUnderlineError = { style = "underline" }, + LspDiagnosticsUnderlineWarning = { style = "underline" }, + LspDiagnosticsUnderlineInformation = { style = "underline" }, + LspDiagnosticsUnderlineInfo = { style = "underline" }, + LspDiagnosticsUnderlineHint = { style = "underline" }, + LspReferenceRead = { bg = "#36383F" }, + LspReferenceText = { bg = "#36383F" }, + LspReferenceWrite = { bg = "#36383f" }, } return LSP diff --git a/lua/no-clown-fiesta/NvimTree.lua b/lua/no-clown-fiesta/NvimTree.lua index b2200cc..665d563 100644 --- a/lua/no-clown-fiesta/NvimTree.lua +++ b/lua/no-clown-fiesta/NvimTree.lua @@ -1,34 +1,34 @@ local NvimTree = { - NvimTreeFolderIcon = { fg = C.blue }, - NvimTreeIndentMarker = { fg = C.alt_bg }, - NvimTreeNormal = { fg = C.light_gray, bg = C.alt_bg }, - NvimTreeVertSplit = { fg = C.alt_bg, bg = C.alt_bg }, - NvimTreeFolderName = { fg = C.blue }, - NvimTreeOpenedFolderName = { fg = C.blue, style = "bold,italic" }, - NvimTreeEmptyFolderName = { fg = C.gray, style = "italic" }, - NvimTreeGitIgnored = { fg = C.gray, style = "italic" }, - NvimTreeImageFile = { fg = C.light_gray }, - NvimTreeSpecialFile = { fg = C.orange }, - NvimTreeEndOfBuffer = { fg = C.alt_bg }, - NvimTreeCursorLine = { bg = C.accent }, - NvimTreeGitignoreIcon = { fg = C.red }, - NvimTreeGitStaged = { fg = C.cyan }, - NvimTreeGitNew = { fg = C.cyan }, - NvimTreeGitRenamed = { fg = C.cyan }, - NvimTreeGitDeleted = { fg = C.sign_delete }, - NvimTreeGitMerge = { fg = C.info_yellow }, - NvimTreeGitDirty = { fg = C.info_yellow }, - NvimTreeSymlink = { fg = C.cyan }, - NvimTreeRootFolder = { fg = C.fg, style = "bold" }, - NvimTreeExecFile = { fg = C.green }, - NvimTreeStatusLine = { fg = C.alt_bg, bg = C.alt_bg }, - NvimTreeStatusLineNC = { fg = C.alt_bg, bg = C.alt_bg }, - NvimTreeStatusNC = { fg = C.alt_bg, bg = C.alt_bg }, - NvimTreeLspDiagnosticsErr = { fg = C.error_red }, - NvimTreeLspDiagnosticsError = { fg = C.error_red }, - NvimTreeLspDiagnosticsHint = { fg = C.hint_blue }, - NvimTreeLspDiagnosticsInformation = { fg = C.info_yellow }, - NvimTreeLspDiagnosticsWarning = { fg = C.warning_orange }, + NvimTreeFolderIcon = { fg = C.blue }, + NvimTreeIndentMarker = { fg = C.alt_bg }, + NvimTreeNormal = { fg = C.light_gray, bg = C.alt_bg }, + NvimTreeVertSplit = { fg = C.alt_bg, bg = C.alt_bg }, + NvimTreeFolderName = { fg = C.blue }, + NvimTreeOpenedFolderName = { fg = C.blue, style = "bold,italic" }, + NvimTreeEmptyFolderName = { fg = C.gray, style = "italic" }, + NvimTreeGitIgnored = { fg = C.gray, style = "italic" }, + NvimTreeImageFile = { fg = C.light_gray }, + NvimTreeSpecialFile = { fg = C.orange }, + NvimTreeEndOfBuffer = { fg = C.alt_bg }, + NvimTreeCursorLine = { bg = C.accent }, + NvimTreeGitignoreIcon = { fg = C.red }, + NvimTreeGitStaged = { fg = C.cyan }, + NvimTreeGitNew = { fg = C.cyan }, + NvimTreeGitRenamed = { fg = C.cyan }, + NvimTreeGitDeleted = { fg = C.sign_delete }, + NvimTreeGitMerge = { fg = C.info_yellow }, + NvimTreeGitDirty = { fg = C.info_yellow }, + NvimTreeSymlink = { fg = C.cyan }, + NvimTreeRootFolder = { fg = C.fg, style = "bold" }, + NvimTreeExecFile = { fg = C.green }, + NvimTreeStatusLine = { fg = C.alt_bg, bg = C.alt_bg }, + NvimTreeStatusLineNC = { fg = C.alt_bg, bg = C.alt_bg }, + NvimTreeStatusNC = { fg = C.alt_bg, bg = C.alt_bg }, + NvimTreeLspDiagnosticsErr = { fg = C.error_red }, + NvimTreeLspDiagnosticsError = { fg = C.error_red }, + NvimTreeLspDiagnosticsHint = { fg = C.hint_blue }, + NvimTreeLspDiagnosticsInformation = { fg = C.info_yellow }, + NvimTreeLspDiagnosticsWarning = { fg = C.warning_orange }, } return NvimTree diff --git a/lua/no-clown-fiesta/Packer.lua b/lua/no-clown-fiesta/Packer.lua new file mode 100644 index 0000000..e69de29 diff --git a/lua/no-clown-fiesta/StatusLine.lua b/lua/no-clown-fiesta/StatusLine.lua index 3436d71..07d96ef 100644 --- a/lua/no-clown-fiesta/StatusLine.lua +++ b/lua/no-clown-fiesta/StatusLine.lua @@ -1,9 +1,9 @@ local StatusLine = { - StatusLine = { fg = C.bg, bg = C.gray }, - StatusLineNC = { fg = C.bg, bg = C.gray }, - StatusLineSeparator = { fg = C.bg }, - StatusLineTerm = { fg = C.bg }, - StatusLineTermNC = { fg = C.bg }, + StatusLine = { fg = C.bg, bg = C.gray }, + StatusLineNC = { fg = C.bg, bg = C.gray }, + StatusLineSeparator = { fg = C.bg }, + StatusLineTerm = { fg = C.bg }, + StatusLineTermNC = { fg = C.bg }, } return StatusLine diff --git a/lua/no-clown-fiesta/Telescope.lua b/lua/no-clown-fiesta/Telescope.lua index 10d2fb6..97e2925 100644 --- a/lua/no-clown-fiesta/Telescope.lua +++ b/lua/no-clown-fiesta/Telescope.lua @@ -1,8 +1,8 @@ local Telescope = { - TelescopeNormal = { fg = C.fg, bg = C.bg }, - TelescopeSelection = { fg = C.fg, bg = C.accent }, - TelescopeMatching = { fg = C.info_yellow, style = "bold" }, - TelescopeBorder = { fg = C.medium_gray, bg = C.bg }, + TelescopeNormal = { fg = C.fg, bg = C.bg }, + TelescopeSelection = { fg = C.fg, bg = C.accent }, + TelescopeMatching = { fg = C.info_yellow, style = "bold" }, + TelescopeBorder = { fg = C.medium_gray, bg = C.bg }, } return Telescope diff --git a/lua/no-clown-fiesta/Treesitter.lua b/lua/no-clown-fiesta/Treesitter.lua index 016c943..d2761e9 100644 --- a/lua/no-clown-fiesta/Treesitter.lua +++ b/lua/no-clown-fiesta/Treesitter.lua @@ -1,56 +1,56 @@ local Treesitter = { - TSComment = { fg = C.medium_gray }, - TSAnnotation = { fg = C.white }, - TSAttribute = { fg = C.white }, - TSConstructor = { fg = C.white }, - TSType = { fg = C.blue }, - TSTypeBuiltin = { fg = C.white }, - TSConditional = { fg = C.red }, - TSException = { fg = C.red }, - TSInclude = { fg = C.red }, - TSKeyword = { fg = C.red }, - TSKeywordFunction = { fg = C.red }, - TSLabel = { fg = C.white }, - TSNamespace = { fg = C.white }, - TSRepeat = { fg = C.red }, - TSConstant = { fg = C.blue }, - TSConstBuiltin = { fg = C.blue }, - TSFloat = { fg = C.blue }, - TSNumber = { fg = C.blue }, - TSBoolean = { fg = C.blue }, - TSCharacter = { fg = C.light_green }, - TSError = { fg = C.error_red }, - TSFunction = { fg = C.cyan }, - TSFuncBuiltin = { fg = C.white }, - TSMethod = { fg = C.white }, - TSConstMacro = { fg = C.white }, - TSFuncMacro = { fg = C.white }, - TSVariable = { fg = C.white }, - TSVariableBuiltin = { fg = C.white }, - TSProperty = { fg = C.white }, - TSOperator = { fg = C.white }, - TSField = { fg = C.white }, - TSParameter = { fg = C.white }, - TSParameterReference = { fg = C.white }, - TSSymbol = { fg = C.medium_gray }, - TSText = { fg = C.fg }, - TSPunctDelimiter = { fg = C.white }, - TSTagDelimiter = { fg = C.white }, - TSPunctBracket = { fg = C.white }, - TSPunctSpecial = { fg = C.medium_gray }, - TSString = { fg = C.medium_gray }, - TSStringRegex = { fg = C.medium_gray }, - TSStringEscape = { fg = C.medium_gray }, - TSTag = { fg = C.pale_purple }, - TSEmphasis = { style = "italic" }, - TSUnderline = { style = "underline" }, - TSTitle = { fg = C.medium_gray }, - TSLiteral = { fg = C.medium_gray }, - TSURI = { fg = C.cyan, style = "underline" }, - TSKeywordOperator = { fg = C.medium_gray }, - TSStructure = { fg = C.purple_test }, - TSStrong = { fg = C.medium_gray }, - TSQueryLinterError = { fg = C.warning_orange }, + TSComment = { fg = C.medium_gray }, + TSAnnotation = { fg = C.white }, + TSAttribute = { fg = C.white }, + TSConstructor = { fg = C.white }, + TSType = { fg = C.blue }, + TSTypeBuiltin = { fg = C.white }, + TSConditional = { fg = C.red }, + TSException = { fg = C.red }, + TSInclude = { fg = C.red }, + TSKeyword = { fg = C.red }, + TSKeywordFunction = { fg = C.red }, + TSLabel = { fg = C.white }, + TSNamespace = { fg = C.white }, + TSRepeat = { fg = C.red }, + TSConstant = { fg = C.blue }, + TSConstBuiltin = { fg = C.blue }, + TSFloat = { fg = C.blue }, + TSNumber = { fg = C.blue }, + TSBoolean = { fg = C.blue }, + TSCharacter = { fg = C.light_green }, + TSError = { fg = C.error_red }, + TSFunction = { fg = C.cyan }, + TSFuncBuiltin = { fg = C.white }, + TSMethod = { fg = C.white }, + TSConstMacro = { fg = C.white }, + TSFuncMacro = { fg = C.white }, + TSVariable = { fg = C.white }, + TSVariableBuiltin = { fg = C.white }, + TSProperty = { fg = C.white }, + TSOperator = { fg = C.white }, + TSField = { fg = C.white }, + TSParameter = { fg = C.white }, + TSParameterReference = { fg = C.white }, + TSSymbol = { fg = C.medium_gray }, + TSText = { fg = C.fg }, + TSPunctDelimiter = { fg = C.white }, + TSTagDelimiter = { fg = C.white }, + TSPunctBracket = { fg = C.white }, + TSPunctSpecial = { fg = C.medium_gray }, + TSString = { fg = C.medium_gray }, + TSStringRegex = { fg = C.medium_gray }, + TSStringEscape = { fg = C.medium_gray }, + TSTag = { fg = C.pale_purple }, + TSEmphasis = { style = "italic" }, + TSUnderline = { style = "underline" }, + TSTitle = { fg = C.medium_gray }, + TSLiteral = { fg = C.medium_gray }, + TSURI = { fg = C.cyan, style = "underline" }, + TSKeywordOperator = { fg = C.medium_gray }, + TSStructure = { fg = C.purple_test }, + TSStrong = { fg = C.medium_gray }, + TSQueryLinterError = { fg = C.warning_orange }, } return Treesitter diff --git a/lua/no-clown-fiesta/Whichkey.lua b/lua/no-clown-fiesta/Whichkey.lua index 535f4d4..9b9fb60 100644 --- a/lua/no-clown-fiesta/Whichkey.lua +++ b/lua/no-clown-fiesta/Whichkey.lua @@ -1,9 +1,9 @@ local Whichkey = { - WhichKey = { fg = C.light_gray }, - WhichKeySeperator = { fg = C.gray }, - WhichKeyGroup = { fg = C.yellow }, - WhichKeyDesc = { fg = C.light_gray }, - WhichKeyFloat = { bg = C.bg }, + WhichKey = { fg = C.light_gray }, + WhichKeySeperator = { fg = C.gray }, + WhichKeyGroup = { fg = C.yellow }, + WhichKeyDesc = { fg = C.light_gray }, + WhichKeyFloat = { bg = C.bg }, } return Whichkey diff --git a/lua/no-clown-fiesta/config.lua b/lua/no-clown-fiesta/config.lua index 3055846..ebac710 100644 --- a/lua/no-clown-fiesta/config.lua +++ b/lua/no-clown-fiesta/config.lua @@ -3,21 +3,21 @@ local config vim = vim or { g = {}, o = {} } local function opt(key, default) - if vim.g[key] == nil then - return default - end - if vim.g[key] == 0 then - return false - end - return vim.g[key] + if vim.g[key] == nil then + return default + end + if vim.g[key] == 0 then + return false + end + return vim.g[key] end config = { - transparent_background = opt("transparent_background", false), - italic_comments = opt("italic_keywords", true) and "italic" or "NONE", - italic_keywords = opt("italic_keywords", true) and "italic" or "NONE", - italic_functions = opt("italic_function", false) and "italic" or "NONE", - italic_variables = opt("italic_variables", true) and "italic" or "NONE", + transparent_background = opt("transparent_background", false), + italic_comments = opt("italic_keywords", true) and "italic" or "NONE", + italic_keywords = opt("italic_keywords", true) and "italic" or "NONE", + italic_functions = opt("italic_function", false) and "italic" or "NONE", + italic_variables = opt("italic_variables", true) and "italic" or "NONE", } return config diff --git a/lua/no-clown-fiesta/highlights.lua b/lua/no-clown-fiesta/highlights.lua index 22f11ae..579e52c 100644 --- a/lua/no-clown-fiesta/highlights.lua +++ b/lua/no-clown-fiesta/highlights.lua @@ -1,99 +1,99 @@ local highlights = { - Normal = { fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg }, - SignColumn = { bg = C.bg }, - MsgArea = { fg = C.fg, bg = C.bg }, - ModeMsg = { fg = C.fg, bg = C.bg }, - MsgSeparator = { fg = C.fg, bg = C.bg }, - SpellBad = { fg = C.error_red, style = "underline" }, - SpellCap = { fg = C.yellow, style = "underline" }, - SpellLocal = { fg = C.green, style = "underline" }, - SpellRare = { fg = C.purple, style = "underline" }, - NormalNC = { fg = C.fg, bg = C.bg }, - Pmenu = { fg = C.light_gray, bg = C.accent }, - PmenuSel = { fg = C.blue, bg = C.alt_bg }, - WildMenu = { fg = C.blue, bg = C.alt_bg }, - CursorLineNr = { fg = C.light_gray, style = "bold" }, - Comment = { fg = C.blue, style = "italic" }, - Folded = { fg = C.light_gray, bg = C.alt_bg }, - FoldColumn = { fg = C.light_gray, bg = C.alt_bg }, - LineNr = { fg = C.gray }, - FloatBoder = { fg = C.gray, bg = C.alt_bg }, - Whitespace = { fg = C.gray }, - VertSplit = { fg = C.bg, bg = C.accent }, - CursorLine = { bg = C.alt_bg }, - CursorColumn = { bg = C.alt_bg }, - ColorColumn = { bg = C.alt_bg }, - NormalFloat = { bg = C.alt_bg }, - Visual = { bg = C.gray }, - VisualNOS = { bg = C.alt_bg }, - WarningMsg = { fg = C.error_red, bg = C.bg }, - DiffAdd = { fg = C.alt_bg, bg = C.sign_add }, - DiffChange = { fg = C.alt_bg, bg = C.sign_change, style = "underline" }, - DiffDelete = { fg = C.alt_bg, bg = C.sign_delete }, - QuickFixLine = { bg = C.accent }, - PmenuSbar = { bg = C.alt_bg }, - PmenuThumb = { bg = C.light_gray }, - MatchWord = { style = "underline" }, - MatchParen = { fg = C.pale_purple, bg = C.bg, style = "underline" }, - MatchWordCur = { style = "underline" }, - MatchParenCur = { style = "underline" }, - Cursor = { fg = C.cursor_fg, bg = C.cursor_bg }, - lCursor = { fg = C.cursor_fg, bg = C.cursor_bg }, - CursorIM = { fg = C.cursor_fg, bg = C.cursor_bg }, - TermCursor = { fg = C.cursor_fg, bg = C.cursor_bg }, - TermCursorNC = { fg = C.cursor_fg, bg = C.cursor_bg }, - Conceal = { fg = C.accent }, - Directory = { fg = C.blue }, - SpecialKey = { fg = C.blue }, - Title = { fg = C.blue }, - ErrorMsg = { fg = C.error_red, bg = C.bg, style = "bold" }, - Search = { fg = C.hint_blue, bg = C.alt_bg }, - IncSearch = { fg = C.hint_blue, bg = C.alt_bg }, - Substitute = { fg = C.alt_bg, bg = C.gray_blue }, - MoreMsg = { fg = C.cyan }, - Question = { fg = C.cyan }, - EndOfBuffer = { fg = C.bg }, - NonText = { fg = C.bg }, - Variable = { fg = C.white }, - String = { fg = C.blue }, - Character = { fg = C.light_green }, - Constant = { fg = C.orange }, - Number = { fg = C.red }, - Boolean = { fg = C.red }, - Float = { fg = C.red }, - Identifier = { fg = C.white }, - Function = { fg = C.purple }, - Operator = { fg = C.orange }, - Type = { fg = C.white }, - StorageClass = { fg = C.yellow }, - Structure = { fg = C.orange }, - Typedef = { fg = C.purple }, - Keyword = { fg = C.orange }, - Statement = { fg = C.orange }, - Conditional = { fg = C.orange }, - Repeat = { fg = C.orange }, - Label = { fg = C.orange }, - Exception = { fg = C.orange }, - Include = { fg = C.orange }, - PreProc = { fg = C.orange }, - Define = { fg = C.orange }, - Macro = { fg = C.orange }, - PreCondit = { fg = C.orange }, - Special = { fg = C.orange }, - SpecialChar = { fg = C.orange }, - Tag = { fg = C.pale_purple }, - Debug = { fg = C.red }, - Delimiter = { fg = C.gray }, - SpecialComment = { fg = C.blue }, - Underlined = { style = "underline" }, - Bold = { style = "bold" }, - Italic = { style = "italic" }, - Ignore = { fg = C.cyan, bg = C.bg, style = "bold" }, - Todo = { fg = C.red, bg = C.bg, style = "bold" }, - Error = { fg = C.error_red, bg = C.bg, style = "bold" }, - TabLine = { fg = C.gray, bg = C.alt_bg }, - TabLineSel = { fg = C.white, bg = C.alt_bg }, - TabLineFill = { fg = C.white, bg = C.alt_bg }, + Normal = { fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg }, + SignColumn = { bg = C.bg }, + MsgArea = { fg = C.fg, bg = C.bg }, + ModeMsg = { fg = C.fg, bg = C.bg }, + MsgSeparator = { fg = C.fg, bg = C.bg }, + SpellBad = { fg = C.error_red, style = "underline" }, + SpellCap = { fg = C.yellow, style = "underline" }, + SpellLocal = { fg = C.green, style = "underline" }, + SpellRare = { fg = C.purple, style = "underline" }, + NormalNC = { fg = C.fg, bg = C.bg }, + Pmenu = { fg = C.light_gray, bg = C.accent }, + PmenuSel = { fg = C.blue, bg = C.alt_bg }, + WildMenu = { fg = C.blue, bg = C.alt_bg }, + CursorLineNr = { fg = C.light_gray, style = "bold" }, + Comment = { fg = C.blue, style = "italic" }, + Folded = { fg = C.light_gray, bg = C.alt_bg }, + FoldColumn = { fg = C.light_gray, bg = C.alt_bg }, + LineNr = { fg = C.gray }, + FloatBoder = { fg = C.gray, bg = C.alt_bg }, + Whitespace = { fg = C.gray }, + VertSplit = { fg = C.bg, bg = C.accent }, + CursorLine = { bg = C.alt_bg }, + CursorColumn = { bg = C.alt_bg }, + ColorColumn = { bg = C.alt_bg }, + NormalFloat = { bg = C.alt_bg }, + Visual = { bg = C.gray }, + VisualNOS = { bg = C.alt_bg }, + WarningMsg = { fg = C.error_red, bg = C.bg }, + DiffAdd = { fg = C.alt_bg, bg = C.sign_add }, + DiffChange = { fg = C.alt_bg, bg = C.sign_change, style = "underline" }, + DiffDelete = { fg = C.alt_bg, bg = C.sign_delete }, + QuickFixLine = { bg = C.accent }, + PmenuSbar = { bg = C.alt_bg }, + PmenuThumb = { bg = C.light_gray }, + MatchWord = { style = "underline" }, + MatchParen = { fg = C.pale_purple, bg = C.bg, style = "underline" }, + MatchWordCur = { style = "underline" }, + MatchParenCur = { style = "underline" }, + Cursor = { fg = C.cursor_fg, bg = C.cursor_bg }, + lCursor = { fg = C.cursor_fg, bg = C.cursor_bg }, + CursorIM = { fg = C.cursor_fg, bg = C.cursor_bg }, + TermCursor = { fg = C.cursor_fg, bg = C.cursor_bg }, + TermCursorNC = { fg = C.cursor_fg, bg = C.cursor_bg }, + Conceal = { fg = C.accent }, + Directory = { fg = C.blue }, + SpecialKey = { fg = C.blue }, + Title = { fg = C.blue }, + ErrorMsg = { fg = C.error_red, bg = C.bg, style = "bold" }, + Search = { fg = C.hint_blue, bg = C.alt_bg }, + IncSearch = { fg = C.hint_blue, bg = C.alt_bg }, + Substitute = { fg = C.alt_bg, bg = C.gray_blue }, + MoreMsg = { fg = C.cyan }, + Question = { fg = C.cyan }, + EndOfBuffer = { fg = C.bg }, + NonText = { fg = C.bg }, + Variable = { fg = C.white }, + String = { fg = C.blue }, + Character = { fg = C.light_green }, + Constant = { fg = C.orange }, + Number = { fg = C.red }, + Boolean = { fg = C.red }, + Float = { fg = C.red }, + Identifier = { fg = C.white }, + Function = { fg = C.purple }, + Operator = { fg = C.orange }, + Type = { fg = C.white }, + StorageClass = { fg = C.yellow }, + Structure = { fg = C.orange }, + Typedef = { fg = C.purple }, + Keyword = { fg = C.orange }, + Statement = { fg = C.orange }, + Conditional = { fg = C.orange }, + Repeat = { fg = C.orange }, + Label = { fg = C.orange }, + Exception = { fg = C.orange }, + Include = { fg = C.orange }, + PreProc = { fg = C.orange }, + Define = { fg = C.orange }, + Macro = { fg = C.orange }, + PreCondit = { fg = C.orange }, + Special = { fg = C.orange }, + SpecialChar = { fg = C.orange }, + Tag = { fg = C.pale_purple }, + Debug = { fg = C.red }, + Delimiter = { fg = C.gray }, + SpecialComment = { fg = C.blue }, + Underlined = { style = "underline" }, + Bold = { style = "bold" }, + Italic = { style = "italic" }, + Ignore = { fg = C.cyan, bg = C.bg, style = "bold" }, + Todo = { fg = C.red, bg = C.bg, style = "bold" }, + Error = { fg = C.error_red, bg = C.bg, style = "bold" }, + TabLine = { fg = C.gray, bg = C.alt_bg }, + TabLineSel = { fg = C.white, bg = C.alt_bg }, + TabLineFill = { fg = C.white, bg = C.alt_bg }, } return highlights diff --git a/lua/no-clown-fiesta/init.lua b/lua/no-clown-fiesta/init.lua index 471e178..9eeea98 100644 --- a/lua/no-clown-fiesta/init.lua +++ b/lua/no-clown-fiesta/init.lua @@ -1,39 +1,39 @@ -vim.api.nvim_command("hi clear") -if vim.fn.exists("syntax_on") then - vim.api.nvim_command("syntax reset") +vim.api.nvim_command "hi clear" +if vim.fn.exists "syntax_on" then + vim.api.nvim_command "syntax reset" end vim.o.background = "dark" vim.o.termguicolors = true vim.g.colors_name = "no-clown-fiesta" -local util = require("no-clown-fiesta.util") -Config = require("no-clown-fiesta.config") -C = require("no-clown-fiesta.palette") +local util = require "no-clown-fiesta.util" +Config = require "no-clown-fiesta.config" +C = require "no-clown-fiesta.palette" -local Git = require("no-clown-fiesta.Git") -local Hop = require("no-clown-fiesta.Hop") -local highlights = require("no-clown-fiesta.highlights") -local LSP = require("no-clown-fiesta.LSP") -local markdown = require("no-clown-fiesta.markdown") -local NvimTree = require("no-clown-fiesta.NvimTree") -local StatusLine = require("no-clown-fiesta.StatusLine") -local Telescope = require("no-clown-fiesta.Telescope") -local Treesitter = require("no-clown-fiesta.Treesitter") -local Whichkey = require("no-clown-fiesta.Whichkey") +local Git = require "no-clown-fiesta.Git" +local Hop = require "no-clown-fiesta.Hop" +local highlights = require "no-clown-fiesta.highlights" +local LSP = require "no-clown-fiesta.LSP" +local markdown = require "no-clown-fiesta.markdown" +local NvimTree = require "no-clown-fiesta.NvimTree" +local StatusLine = require "no-clown-fiesta.StatusLine" +local Telescope = require "no-clown-fiesta.Telescope" +local Treesitter = require "no-clown-fiesta.Treesitter" +local Whichkey = require "no-clown-fiesta.Whichkey" local skeletons = { - Git, - Hop, - highlights, - markdown, - NvimTree, - LSP, - StatusLine, - Telescope, - Treesitter, - Whichkey, + Git, + Hop, + highlights, + markdown, + NvimTree, + LSP, + StatusLine, + Telescope, + Treesitter, + Whichkey, } for _, skeleton in ipairs(skeletons) do - util.initialise(skeleton) + util.initialise(skeleton) end diff --git a/lua/no-clown-fiesta/markdown.lua b/lua/no-clown-fiesta/markdown.lua index c2e7436..2b83e05 100644 --- a/lua/no-clown-fiesta/markdown.lua +++ b/lua/no-clown-fiesta/markdown.lua @@ -1,27 +1,27 @@ local markdown = { - markdownBlockquote = { fg = C.accent }, - markdownBold = { fg = C.yellow, style = "bold" }, - markdownCode = { fg = C.green }, - markdownCodeBlock = { fg = C.green }, - markdownCodeDelimiter = { fg = C.green }, - markdownH1 = { fg = C.blue }, - markdownH2 = { fg = C.blue }, - markdownH3 = { fg = C.blue }, - markdownH4 = { fg = C.blue }, - markdownH5 = { fg = C.blue }, - markdownH6 = { fg = C.blue }, - markdownHeadingDelimiter = { fg = C.red }, - markdownHeadingRule = { fg = C.accent }, - markdownId = { fg = C.purple }, - markdownIdDeclaration = { fg = C.blue }, - markdownIdDelimiter = { fg = C.light_gray }, - markdownLinkDelimiter = { fg = C.light_gray }, - markdownItalic = { style = "italic" }, - markdownLinkText = { fg = C.blue }, - markdownListMarker = { fg = C.red }, - markdownOrderedListMarker = { fg = C.red }, - markdownRule = { fg = C.accent }, - markdownUrl = { fg = C.cyan, style = "underline" }, + markdownBlockquote = { fg = C.accent }, + markdownBold = { fg = C.yellow, style = "bold" }, + markdownCode = { fg = C.green }, + markdownCodeBlock = { fg = C.green }, + markdownCodeDelimiter = { fg = C.green }, + markdownH1 = { fg = C.blue }, + markdownH2 = { fg = C.blue }, + markdownH3 = { fg = C.blue }, + markdownH4 = { fg = C.blue }, + markdownH5 = { fg = C.blue }, + markdownH6 = { fg = C.blue }, + markdownHeadingDelimiter = { fg = C.red }, + markdownHeadingRule = { fg = C.accent }, + markdownId = { fg = C.purple }, + markdownIdDeclaration = { fg = C.blue }, + markdownIdDelimiter = { fg = C.light_gray }, + markdownLinkDelimiter = { fg = C.light_gray }, + markdownItalic = { style = "italic" }, + markdownLinkText = { fg = C.blue }, + markdownListMarker = { fg = C.red }, + markdownOrderedListMarker = { fg = C.red }, + markdownRule = { fg = C.accent }, + markdownUrl = { fg = C.cyan, style = "underline" }, } return markdown diff --git a/lua/no-clown-fiesta/palette.lua b/lua/no-clown-fiesta/palette.lua index 5288ed3..93e3a6d 100644 --- a/lua/no-clown-fiesta/palette.lua +++ b/lua/no-clown-fiesta/palette.lua @@ -1,34 +1,34 @@ local colors = { - fg = "#E1E1E1", - bg = "#151515", - alt_bg = "#171717", - accent = "#202020", - white = "#E1E1E1", - gray = "#373737", - medium_gray = "#727272", - light_gray = "#D0D0D0", - blue = "#A5D6FF", - gray_blue = "#5F819D", - cyan = "#75B5AA", - red = "#CC6666", - green = "#90A959", - light_green = "#90A959", - yellow = "#F4BF75", - orange = "#FFA557", - purple = "#AA749F", - pale_purple = "#A5D6FF", - magenta = "#AA759F", - cursor_fg = "#D0D0D0", - cursor_bg = "#151515", - sign_add = "#A1B56C", - sign_change = "#A5D6FF", - sign_delete = "#AA4142", - error_red = "#AC4142", - warning_orange = "#F4BF75", - info_yellow = "#F4BF75", - hint_blue = "#A5D6FF", - purple_test = "#ff00ff", - cyan_test = "#00ffff", + fg = "#E1E1E1", + bg = "#151515", + alt_bg = "#171717", + accent = "#202020", + white = "#E1E1E1", + gray = "#373737", + medium_gray = "#727272", + light_gray = "#D0D0D0", + blue = "#A5D6FF", + gray_blue = "#5F819D", + cyan = "#75B5AA", + red = "#CC6666", + green = "#90A959", + light_green = "#90A959", + yellow = "#F4BF75", + orange = "#FFA557", + purple = "#AA749F", + pale_purple = "#A5D6FF", + magenta = "#AA759F", + cursor_fg = "#D0D0D0", + cursor_bg = "#151515", + sign_add = "#A1B56C", + sign_change = "#A5D6FF", + sign_delete = "#AA4142", + error_red = "#AC4142", + warning_orange = "#F4BF75", + info_yellow = "#F4BF75", + hint_blue = "#A5D6FF", + purple_test = "#ff00ff", + cyan_test = "#00ffff", } return colors diff --git a/lua/no-clown-fiesta/util.lua b/lua/no-clown-fiesta/util.lua index 07f71a2..dbac18a 100644 --- a/lua/no-clown-fiesta/util.lua +++ b/lua/no-clown-fiesta/util.lua @@ -1,25 +1,25 @@ local M = {} local function highlight(group, properties) - local bg = properties.bg == nil and "" or "guibg=" .. properties.bg - local fg = properties.fg == nil and "" or "guifg=" .. properties.fg - local style = properties.style == nil and "" or "gui=" .. properties.style + local bg = properties.bg == nil and "" or "guibg=" .. properties.bg + local fg = properties.fg == nil and "" or "guifg=" .. properties.fg + local style = properties.style == nil and "" or "gui=" .. properties.style - local cmd = table.concat({ - "highlight", - group, - bg, - fg, - style, - }, " ") + local cmd = table.concat({ + "highlight", + group, + bg, + fg, + style, + }, " ") - vim.api.nvim_command(cmd) + vim.api.nvim_command(cmd) end function M.initialise(skeleton) - for group, properties in pairs(skeleton) do - highlight(group, properties) - end + for group, properties in pairs(skeleton) do + highlight(group, properties) + end end return M -- cgit v1.2.3-70-g09d2