summaryrefslogtreecommitdiff
path: root/lua/spacegray
diff options
context:
space:
mode:
Diffstat (limited to 'lua/spacegray')
-rw-r--r--lua/spacegray/LSP.lua25
-rw-r--r--lua/spacegray/Treesitter.lua32
-rw-r--r--lua/spacegray/Whichkey.lua4
-rw-r--r--lua/spacegray/highlights.lua58
-rw-r--r--lua/spacegray/init.lua13
-rw-r--r--lua/spacegray/palette.lua43
6 files changed, 101 insertions, 74 deletions
diff --git a/lua/spacegray/LSP.lua b/lua/spacegray/LSP.lua
index 2dfa07ff..dd3d77ac 100644
--- a/lua/spacegray/LSP.lua
+++ b/lua/spacegray/LSP.lua
@@ -19,15 +19,15 @@ local LSP = {
LspDiagnosticsWarning = { fg = C.warning_orange },
LspDiagnosticsInformation = { fg = C.info_yellow },
LspDiagnosticsHint = { fg = C.hint_blue },
- LspDiagnosticsUnderlineError = { fg = C.error_red },
- LspDiagnosticsUnderlineWarning = { fg = C.warning_orange },
- LspDiagnosticsUnderlineInformation = { fg = C.info_yellow },
- LspDiagnosticsUnderlineHint = { fg = C.hint_blue },
- QuickScopePrimary = { fg = C.cyan_test, style = "underline" },
- QuickScopeSecondary = { fg = C.purple_test, style = "underline" },
+ LspDiagnosticsUnderlineError = { style = "underline" },
+ LspDiagnosticsUnderlineWarning = { style = "underline" },
+ LspDiagnosticsUnderlineInformation = { style = "underline" },
+ LspDiagnosticsUnderlineHint = { style = "underline" },
+ QuickScopePrimary = { fg = C.purple_test, style = "underline" },
+ QuickScopeSecondary = { fg = C.cyan_test, style = "underline" },
TelescopeSelection = { fg = C.hint_blue },
TelescopeMatching = { fg = C.info_yellow, style = "bold" },
- TelescopeBorder = { fg = C.cyan, bg = C.bg },
+ TelescopeBorder = { fg = C.cyan, bg = Config.transparent_background and "NONE" or C.bg },
NvimTreeFolderIcon = { fg = C.blue },
NvimTreeIndentMarker = { fg = C.gray },
NvimTreeNormal = { fg = C.light_gray, bg = C.alt_bg },
@@ -45,6 +45,10 @@ local LSP = {
NvimTreeSymlink = { fg = C.cyan },
NvimTreeRootFolder = { fg = C.fg, style = "bold" },
NvimTreeExecFile = { fg = C.green },
+ LirFloatNormal = { fg = C.light_gray, bg = C.alt_bg },
+ LirDir = { fg = C.blue },
+ LirSymLink = { fg = C.cyan },
+ LirEmptyDirText = { fg = C.blue },
BufferCurrent = { fg = C.fg, bg = C.bg },
BufferCurrentIndex = { fg = C.fg, bg = C.bg },
BufferCurrentMod = { fg = C.info_yellow, bg = C.bg },
@@ -53,7 +57,7 @@ local LSP = {
BufferVisible = { fg = C.fg, bg = C.bg },
BufferVisibleIndex = { fg = C.fg, bg = C.bg },
BufferVisibleMod = { fg = C.info_yellow, bg = C.bg },
- BufferVisibleSign = { fg = C.hint_blue, bg = C.bg },
+ BufferVisibleSign = { fg = C.gray, bg = C.bg },
BufferVisibleTarget = { fg = C.red, bg = C.bg, style = "bold" },
BufferInactive = { fg = C.gray, bg = C.alt_bg },
BufferInactiveIndex = { fg = C.gray, bg = C.alt_bg },
@@ -65,11 +69,14 @@ local LSP = {
StatusLineSeparator = { fg = C.alt_bg },
StatusLineTerm = { fg = C.alt_bg },
StatusLineTermNC = { fg = C.alt_bg },
- CodiVirtualText = { fg = C.pale_purple },
+ CodiVirtualText = { fg = C.hint_blue },
IndentBlanklineContextChar = { fg = C.accent },
DashboardHeader = { fg = C.blue },
DashboardCenter = { fg = C.purple },
DashboardFooter = { fg = C.cyan },
+ xmlTag = { fg = C.cyan },
+ xmlTagName = { fg = C.cyan },
+ xmlEndTag = { fg = C.cyan },
CompeDocumentation = { bg = C.alt_bg },
DiffViewNormal = { fg = C.gray, bg = C.alt_bg },
DiffviewStatusAdded = { fg = C.sign_add },
diff --git a/lua/spacegray/Treesitter.lua b/lua/spacegray/Treesitter.lua
index 01dfacb5..4e5ce16e 100644
--- a/lua/spacegray/Treesitter.lua
+++ b/lua/spacegray/Treesitter.lua
@@ -14,7 +14,7 @@ local Treesitter = {
TSNamespace = { fg = C.blue },
TSRepeat = { fg = C.blue },
TSConstant = { fg = C.orange },
- TSConstBuiltin = { fg = C.orange },
+ TSConstBuiltin = { fg = C.red },
TSFloat = { fg = C.red },
TSNumber = { fg = C.red },
TSBoolean = { fg = C.red },
@@ -24,32 +24,32 @@ local Treesitter = {
TSFuncBuiltin = { fg = C.yellow },
TSMethod = { fg = C.yellow },
TSConstMacro = { fg = C.cyan },
- TSFuncMacro = { fg = C.cyan },
- TSVariable = { fg = C.white },
- TSVariableBuiltin = { fg = C.cyan },
- TSProperty = { fg = C.cyan },
- TSOperator = { fg = C.gray_blue },
- TSField = { fg = C.white },
- TSParameter = { fg = C.white },
- TSParameterReference = { fg = C.white },
- TSSymbol = { fg = C.white },
+ TSFuncMacro = { fg = C.yellow },
+ TSVariable = { fg = C.light_blue },
+ TSVariableBuiltin = { fg = C.light_blue },
+ TSProperty = { fg = C.light_blue },
+ TSOperator = { fg = C.gray },
+ TSField = { fg = C.light_blue },
+ TSParameter = { fg = C.light_blue },
+ TSParameterReference = { fg = C.light_blue },
+ TSSymbol = { fg = C.light_blue },
TSText = { fg = C.fg },
TSPunctDelimiter = { fg = C.gray },
TSTagDelimiter = { fg = C.gray },
TSPunctBracket = { fg = C.gray },
TSPunctSpecial = { fg = C.gray },
TSString = { fg = C.green },
- TSStringRegex = { fg = C.light_green },
- TSStringEscape = { fg = C.light_green },
+ TSStringRegex = { fg = C.yellow_orange },
+ TSStringEscape = { fg = C.yellow_orange },
TSTag = { fg = C.blue },
TSEmphasis = { style = "italic" },
TSUnderline = { style = "underline" },
TSTitle = { fg = C.blue, style = "bold" },
- TSLiteral = { fg = C.green },
- TSURI = { fg = C.cyan, style = "underline" },
+ TSLiteral = { fg = C.yellow_orange },
+ TSURI = { fg = C.yellow_orange, style = "underline" },
TSKeywordOperator = { fg = C.blue },
- TSStructure = { fg = C.purple_test },
- TSStrong = { fg = C.yellow },
+ TSStructure = { fg = C.light_blue },
+ TSStrong = { fg = C.yellow_orange },
TSQueryLinterError = { fg = C.warning_orange },
}
diff --git a/lua/spacegray/Whichkey.lua b/lua/spacegray/Whichkey.lua
index f382d784..5d1ae7ce 100644
--- a/lua/spacegray/Whichkey.lua
+++ b/lua/spacegray/Whichkey.lua
@@ -2,8 +2,8 @@ local Whichkey = {
WhichKey = { fg = C.purple },
WhichKeySeperator = { fg = C.green },
WhichKeyGroup = { fg = C.blue },
- WhichKeyDesc = { fg = C.cyan },
- WhichKeyFloat = { bg = C.alt_bg },
+ WhichKeyDesc = { fg = C.light_blue },
+ WhichKeyFloat = { bg = C.dark },
}
return Whichkey
diff --git a/lua/spacegray/highlights.lua b/lua/spacegray/highlights.lua
index e8700d8f..208c2c62 100644
--- a/lua/spacegray/highlights.lua
+++ b/lua/spacegray/highlights.lua
@@ -1,15 +1,15 @@
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 },
+ MsgArea = { fg = C.fg, bg = Config.transparent_background and "NONE" or 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.white, bg = C.accent },
+ NormalNC = { fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg },
+ Pmenu = { fg = C.light_gray, bg = C.popup_back },
PmenuSel = { fg = C.alt_bg, bg = C.blue },
WildMenu = { fg = C.alt_bg, bg = C.blue },
CursorLineNr = { fg = C.light_gray, style = "bold" },
@@ -17,24 +17,24 @@ local highlights = {
Folded = { fg = C.accent, bg = C.alt_bg },
FoldColumn = { fg = C.accent, bg = C.alt_bg },
LineNr = { fg = C.gray },
- FloatBorder = { 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.alt_bg },
+ FloatBoder = { fg = C.gray, bg = C.alt_bg },
+ Whitespace = { fg = C.bg },
+ VertSplit = { fg = C.bg, bg = C.fg },
+ CursorLine = { bg = C.dark },
+ CursorColumn = { bg = C.dark },
+ ColorColumn = { bg = C.dark },
+ NormalFloat = { bg = C.dark },
+ Visual = { bg = C.ui_blue },
VisualNOS = { bg = C.alt_bg },
- WarningMsg = { fg = C.warning_orange, bg = C.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.white },
+ PmenuThumb = { bg = C.gray },
MatchWord = { style = "underline" },
- MatchParen = { fg = C.pale_purple, bg = C.bg, style = "underline" },
+ MatchParen = { fg = C.hint_blue, bg = C.bg, style = "underline" },
MatchWordCur = { style = "underline" },
MatchParenCur = { style = "underline" },
Cursor = { fg = C.cursor_fg, bg = C.cursor_bg },
@@ -47,23 +47,23 @@ local highlights = {
SpecialKey = { fg = C.blue, style = "bold" },
Title = { fg = C.blue, style = "bold" },
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 },
+ Search = { fg = C.light_gray, bg = C.search_blue },
+ IncSearch = { fg = C.light_gray, bg = C.search_blue },
+ Substitute = { fg = C.light_gray, bg = C.search_orange },
+ MoreMsg = { fg = C.orange },
+ Question = { fg = C.orange },
EndOfBuffer = { fg = C.bg },
NonText = { fg = C.bg },
- Variable = { fg = C.white },
+ Variable = { fg = C.light_blue },
String = { fg = C.green },
Character = { fg = C.light_green },
- Constant = { fg = C.orange },
+ Constant = { fg = C.blue },
Number = { fg = C.red },
Boolean = { fg = C.red },
Float = { fg = C.red },
- Identifier = { fg = C.white },
+ Identifier = { fg = C.light_blue },
Function = { fg = C.yellow },
- Operator = { fg = C.gray_blue },
+ Operator = { fg = C.gray },
Type = { fg = C.purple },
StorageClass = { fg = C.purple },
Structure = { fg = C.purple },
@@ -75,12 +75,12 @@ local highlights = {
Label = { fg = C.blue },
Exception = { fg = C.blue },
Include = { fg = C.blue },
- PreProc = { fg = C.cyan },
- Define = { fg = C.cyan },
- Macro = { fg = C.cyan },
- PreCondit = { fg = C.cyan },
+ PreProc = { fg = C.purple },
+ Define = { fg = C.purple },
+ Macro = { fg = C.purple },
+ PreCondit = { fg = C.purple },
Special = { fg = C.orange },
- SpecialChar = { fg = C.orange },
+ SpecialChar = { fg = C.white },
Tag = { fg = C.blue },
Debug = { fg = C.red },
Delimiter = { fg = C.gray },
@@ -91,7 +91,7 @@ local highlights = {
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.white, bg = C.alt_bg },
+ TabLine = { fg = C.light_gray, bg = C.alt_bg },
TabLineSel = { fg = C.white, bg = C.alt_bg },
TabLineFill = { fg = C.white, bg = C.alt_bg },
}
diff --git a/lua/spacegray/init.lua b/lua/spacegray/init.lua
index 8da13a06..9ae24dbb 100644
--- a/lua/spacegray/init.lua
+++ b/lua/spacegray/init.lua
@@ -9,6 +9,17 @@ vim.g.colors_name = "spacegray"
local util = require "spacegray.util"
Config = require "spacegray.config"
C = require "spacegray.palette"
+
+local async
+async = vim.loop.new_async(vim.schedule_wrap(function()
+ local skeletons = {}
+ for _, skeleton in ipairs(skeletons) do
+ util.initialise(skeleton)
+ end
+
+ async:close()
+end))
+
local highlights = require "spacegray.highlights"
local Treesitter = require "spacegray.Treesitter"
local markdown = require "spacegray.markdown"
@@ -28,3 +39,5 @@ local skeletons = {
for _, skeleton in ipairs(skeletons) do
util.initialise(skeleton)
end
+
+async:send()
diff --git a/lua/spacegray/palette.lua b/lua/spacegray/palette.lua
index 49e429e5..924482fd 100644
--- a/lua/spacegray/palette.lua
+++ b/lua/spacegray/palette.lua
@@ -1,21 +1,27 @@
local colors = {
- fg = "#c8c9d1",
- bg = "#212121",
- alt_bg = "#2a2a2a",
- accent = "#383d45",
- white = "#c8c9d1",
- gray = "#858585",
+ fg = "#ABB2BF",
+ bg = "#202020",
+ alt_bg = "#262626",
+ dark = "#222222",
+ accent = "#AAAAAA",
+ popup_back = "#2D2D30",
+ search_orange = "#613214",
+ search_blue = "#5e81ac",
+ white = "#D8DEE9",
+ gray = "#9BA1AB",
light_gray = "#c8c9c1",
- blue = "#5486c0",
- gray_blue = "#66899d",
- cyan = "#65a7c5",
- red = "#b04b57",
- green = "#87b379",
- light_green = "#b2d77c",
- yellow = "#eeba5a",
- orange = "#c6735a",
- purple = "#bf83c1",
- pale_purple = "#7199ee",
+ blue = "#5f8ccd",
+ dark_blue = "#223E55",
+ light_blue = "#8dc0d5",
+ green = "#83ba8b",
+ cyan = "#4EC9B0",
+ light_green = "#B5CEA8",
+ red = "#D16969",
+ orange = "#D1866B",
+ light_red = "#CA535F",
+ yellow = "#ECCC8E",
+ yellow_orange = "#D7BA7D",
+ purple = "#BF82B4",
magenta = "#D16D9E",
cursor_fg = "#515052",
cursor_bg = "#AEAFAD",
@@ -26,8 +32,9 @@ local colors = {
warning_orange = "#ff8800",
info_yellow = "#FFCC66",
hint_blue = "#4FC1FF",
- purple_test = "#ff00ff",
- cyan_test = "#00ffff",
+ purple_test = "#ff007c",
+ cyan_test = "#00dfff",
+ ui_blue = "#264F78",
}
return colors