16 files changed, 200 insertions, 153 deletions
diff --git a/colors/onedarker.vim b/colors/onedarker.vim
new file mode 100644
index 00000000..42f2dbcb
--- /dev/null
+++ b/colors/onedarker.vim
@@ -0,0 +1,13 @@
+" Author: Christian Chiarulli <[email protected]>
+
+lua << EOF
+package.loaded['onedarker'] = nil
+package.loaded['onedarker.highlights'] = nil
+package.loaded['onedarker.Treesitter'] = nil
+package.loaded['onedarker.markdown'] = nil
+package.loaded['onedarker.Whichkey'] = nil
+package.loaded['onedarker.Git'] = nil
+package.loaded['onedarker.LSP'] = nil
+
+require("onedarker")
+EOF
diff --git a/colors/spacegray.vim b/colors/spacegray.vim
deleted file mode 100644
index 8d075ee1..00000000
--- a/colors/spacegray.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-" Author: Christian Chiarulli <[email protected]>
-lua require("spacegray")
-\ No newline at end of file
diff --git a/lua/config/defaults.lua b/lua/config/defaults.lua
index 9bd1bdd8..4f538dbb 100644
--- a/lua/config/defaults.lua
+++ b/lua/config/defaults.lua
@@ -8,7 +8,7 @@ vim.cmd [[ set spellfile=~/.config/lvim/spell/en.utf-8.add ]]
 
 lvim = {
   leader = "space",
-  colorscheme = "spacegray",
+  colorscheme = "onedarker",
   line_wrap_cursor_movement = true,
   transparent_window = false,
   format_on_save = true,
diff --git a/lua/lualine/themes/onedarker.lua b/lua/lualine/themes/onedarker.lua
new file mode 100644
index 00000000..396657bb
--- /dev/null
+++ b/lua/lualine/themes/onedarker.lua
@@ -0,0 +1,35 @@
+-- Copyright (c) 2020-2021 shadmansaleh
+-- MIT license, see LICENSE for more details.
+-- Credit: Zoltan Dalmadi(lightline)
+-- LuaFormatter off
+local colors = {
+  blue = "#61afef",
+  green = "#98c379",
+  purple = "#c678dd",
+  red1 = "#e06c75",
+  red2 = "#be5046",
+  yellow = "#e5c07b",
+  orange = "#D19A66",
+  fg = "#abb2bf",
+  bg = "#282c34",
+  gray1 = "#5c6370",
+  gray2 = "#2c323d",
+  gray3 = "#3e4452",
+}
+-- LuaFormatter on
+return {
+  normal = {
+    a = { fg = colors.fg, bg = colors.blue, gui = "bold" },
+    b = { fg = colors.fg, bg = colors.bg },
+    c = { fg = colors.fg, bg = colors.bg },
+  },
+  insert = { a = { fg = colors.fg, bg = colors.green, gui = "bold" } },
+  visual = { a = { fg = colors.fg, bg = colors.purple, gui = "bold" } },
+  command = { a = { fg = colors.fg, bg = colors.yellow, gui = "bold" } },
+  replace = { a = { fg = colors.fg, bg = colors.red1, gui = "bold" } },
+  inactive = {
+    a = { fg = colors.gray1, bg = colors.bg, gui = "bold" },
+    b = { fg = colors.gray1, bg = colors.bg },
+    c = { fg = colors.gray1, bg = colors.bg },
+  },
+}
diff --git a/lua/spacegray/Git.lua b/lua/onedarker/Git.lua
index b47ccf23..b47ccf23 100644
--- a/lua/spacegray/Git.lua
+++ b/lua/onedarker/Git.lua
diff --git a/lua/spacegray/LSP.lua b/lua/onedarker/LSP.lua
index dd3d77ac..1ba7056b 100644
--- a/lua/spacegray/LSP.lua
+++ b/lua/onedarker/LSP.lua
@@ -70,13 +70,16 @@ local LSP = {
   StatusLineTerm = { fg = C.alt_bg },
   StatusLineTermNC = { fg = C.alt_bg },
   CodiVirtualText = { fg = C.hint_blue },
-  IndentBlanklineContextChar = { fg = C.accent },
+  IndentBlanklineContextChar = { fg = C.context },
+  IndentBlanklineChar = { fg = C.dark_gray },
+  IndentBlanklineSpaceChar = { fg = C.cyan_test },
+  IndentBlanklineSpaceCharBlankline = { fg = C.info_yellow },
   DashboardHeader = { fg = C.blue },
   DashboardCenter = { fg = C.purple },
   DashboardFooter = { fg = C.cyan },
-  xmlTag = { fg = C.cyan },
-  xmlTagName = { fg = C.cyan },
-  xmlEndTag = { fg = C.cyan },
+  xmlTag = { fg = C.blue },
+  xmlTagName = { fg = C.blue },
+  xmlEndTag = { fg = C.blue },
   CompeDocumentation = { bg = C.alt_bg },
   DiffViewNormal = { fg = C.gray, bg = C.alt_bg },
   DiffviewStatusAdded = { fg = C.sign_add },
@@ -94,6 +97,8 @@ local LSP = {
   diffOldFile = { fg = C.red },
   debugPc = { bg = C.cyan },
   debugBreakpoint = { fg = C.red, style = "reverse" },
+  FocusedSymbol = { fg = C.purple, style = "bold" },
+  SymbolsOutlineConnector = { fg = C.context },
 }
 
 return LSP
diff --git a/lua/onedarker/Treesitter.lua b/lua/onedarker/Treesitter.lua
new file mode 100644
index 00000000..c8607ce5
--- /dev/null
+++ b/lua/onedarker/Treesitter.lua
@@ -0,0 +1,66 @@
+local Treesitter = {
+  TSComment = { fg = C.gray },
+  TSAnnotation = { fg = C.blue },
+  TSAttribute = { fg = C.cyan },
+  TSConstructor = { fg = C.yellow },
+  TSType = { fg = C.yellow },
+  TSTypeBuiltin = { fg = C.yellow },
+  TSConditional = { fg = C.purple },
+  TSException = { fg = C.purple },
+  TSInclude = { fg = C.purple },
+  TSKeyword = { fg = C.purple },
+  TSKeywordReturn = { fg = C.purple },
+  TSKeywordFunction = { fg = C.purple },
+  TSLabel = { fg = C.red },
+  TSNone = { fg = C.fg },
+  TSNamespace = { fg = C.purple },
+  TSRepeat = { fg = C.purple },
+  TSConstant = { fg = C.orange },
+  TSConstBuiltin = { fg = C.orange },
+  TSFloat = { fg = C.orange },
+  TSNumber = { fg = C.orange },
+  TSBoolean = { fg = C.orange },
+  TSCharacter = { fg = C.green },
+  TSError = { fg = C.error_red },
+  TSFunction = { fg = C.blue },
+  TSFuncBuiltin = { fg = C.blue },
+  TSMethod = { fg = C.blue },
+  TSConstMacro = { fg = C.cyan },
+  TSFuncMacro = { fg = C.blue },
+  TSProperty = { fg = C.cyan },
+  TSOperator = { fg = C.purple },
+  TSField = { fg = C.blue },
+  TSParameter = { fg = C.red },
+  TSParameterReference = { fg = C.red },
+  TSVariable = { fg = C.fg },
+  TSVariableBuiltin = { fg = C.red },
+  TSSymbol = { fg = C.cyan },
+  TSText = { fg = C.fg },
+  TSTextReference = { fg = C.red },
+  TSPunctDelimiter = { fg = C.fg },
+  TSTagDelimiter = { fg = C.gray },
+  TSTagAttribute = { fg = C.orange },
+  TSPunctBracket = { fg = C.fg },
+  TSPunctSpecial = { fg = C.fg },
+  TSString = { fg = C.green },
+  TSStringRegex = { fg = C.orange },
+  TSStringEscape = { fg = C.orange },
+  TSTag = { fg = C.blue },
+  TSEmphasis = { style = "italic" },
+  TSUnderline = { style = "underline" },
+  TSWarning = { fg = C.warning_orange },
+  TSDanger = { fg = C.error_red },
+  TSTitle = { fg = C.blue, style = "bold" },
+  TSLiteral = { fg = C.green },
+  TSURI = { fg = C.blue, style = "underline" },
+  TSMath = { fg = C.fg },
+  TSKeywordOperator = { fg = C.purple },
+  TSStructure = { fg = C.fg },
+  TSStrong = { fg = C.yellow_orange },
+  TSQueryLinterError = { fg = C.warning_orange },
+  TSEnvironment = { fg = C.fg },
+  TSEnvironmentName = { fg = C.fg },
+  TSNote = { fg = C.blue },
+}
+
+return Treesitter
diff --git a/lua/spacegray/Whichkey.lua b/lua/onedarker/Whichkey.lua
index 5d1ae7ce..86b42bd6 100644
--- a/lua/spacegray/Whichkey.lua
+++ b/lua/onedarker/Whichkey.lua
@@ -1,8 +1,8 @@
 local Whichkey = {
   WhichKey = { fg = C.purple },
   WhichKeySeperator = { fg = C.green },
-  WhichKeyGroup = { fg = C.blue },
-  WhichKeyDesc = { fg = C.light_blue },
+  WhichKeyGroup = { fg = C.cyan },
+  WhichKeyDesc = { fg = C.blue },
   WhichKeyFloat = { bg = C.dark },
 }
 
diff --git a/lua/spacegray/config.lua b/lua/onedarker/config.lua
index ebac7109..ebac7109 100644
--- a/lua/spacegray/config.lua
+++ b/lua/onedarker/config.lua
diff --git a/lua/spacegray/highlights.lua b/lua/onedarker/highlights.lua
index 208c2c62..e4b9eeac 100644
--- a/lua/spacegray/highlights.lua
+++ b/lua/onedarker/highlights.lua
@@ -13,10 +13,10 @@ local highlights = {
   PmenuSel = { fg = C.alt_bg, bg = C.blue },
   WildMenu = { fg = C.alt_bg, bg = C.blue },
   CursorLineNr = { fg = C.light_gray, style = "bold" },
-  Comment = { fg = C.gray, style = "italic" },
+  Comment = { fg = C.green, style = "italic" },
   Folded = { fg = C.accent, bg = C.alt_bg },
   FoldColumn = { fg = C.accent, bg = C.alt_bg },
-  LineNr = { fg = C.gray },
+  LineNr = { fg = C.context },
   FloatBoder = { fg = C.gray, bg = C.alt_bg },
   Whitespace = { fg = C.bg },
   VertSplit = { fg = C.bg, bg = C.fg },
@@ -30,7 +30,7 @@ local highlights = {
   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 },
+  QuickFixLine = { bg = C.dark_gray },
   PmenuSbar = { bg = C.alt_bg },
   PmenuThumb = { bg = C.gray },
   MatchWord = { style = "underline" },
@@ -54,36 +54,36 @@ local highlights = {
   Question = { fg = C.orange },
   EndOfBuffer = { fg = C.bg },
   NonText = { fg = C.bg },
-  Variable = { fg = C.light_blue },
+  Variable = { fg = C.cyan },
   String = { fg = C.green },
-  Character = { fg = C.light_green },
-  Constant = { fg = C.blue },
-  Number = { fg = C.red },
-  Boolean = { fg = C.red },
-  Float = { fg = C.red },
-  Identifier = { fg = C.light_blue },
-  Function = { fg = C.yellow },
-  Operator = { fg = C.gray },
-  Type = { fg = C.purple },
-  StorageClass = { fg = C.purple },
+  Character = { fg = C.green },
+  Constant = { fg = C.orange },
+  Number = { fg = C.orange },
+  Boolean = { fg = C.orange },
+  Float = { fg = C.orange },
+  Identifier = { fg = C.fg },
+  Function = { fg = C.blue },
+  Operator = { fg = C.purple },
+  Type = { fg = C.cyan },
+  StorageClass = { fg = C.cyan },
   Structure = { fg = C.purple },
   Typedef = { fg = C.purple },
-  Keyword = { fg = C.blue },
-  Statement = { fg = C.blue },
-  Conditional = { fg = C.blue },
-  Repeat = { fg = C.blue },
-  Label = { fg = C.blue },
-  Exception = { fg = C.blue },
-  Include = { fg = C.blue },
+  Keyword = { fg = C.purple },
+  Statement = { fg = C.purple },
+  Conditional = { fg = C.purple },
+  Repeat = { fg = C.purple },
+  Label = { fg = C.cyan },
+  Exception = { fg = C.purple },
+  Include = { fg = C.purple },
   PreProc = { fg = C.purple },
   Define = { fg = C.purple },
   Macro = { fg = C.purple },
   PreCondit = { fg = C.purple },
-  Special = { fg = C.orange },
-  SpecialChar = { fg = C.white },
+  Special = { fg = C.purple },
+  SpecialChar = { fg = C.fg },
   Tag = { fg = C.blue },
   Debug = { fg = C.red },
-  Delimiter = { fg = C.gray },
+  Delimiter = { fg = C.fg },
   SpecialComment = { fg = C.gray },
   Underlined = { style = "underline" },
   Bold = { style = "bold" },
@@ -92,8 +92,8 @@ local highlights = {
   Todo = { fg = C.red, bg = C.bg, style = "bold" },
   Error = { fg = C.error_red, bg = C.bg, style = "bold" },
   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 },
+  TabLineSel = { fg = C.fg, bg = C.alt_bg },
+  TabLineFill = { fg = C.fg, bg = C.alt_bg },
 }
 
 return highlights
diff --git a/lua/onedarker/init.lua b/lua/onedarker/init.lua
new file mode 100644
index 00000000..852e0103
--- /dev/null
+++ b/lua/onedarker/init.lua
@@ -0,0 +1,30 @@
+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 = "onedarker"
+
+local util = require "onedarker.util"
+Config = require "onedarker.config"
+C = require "onedarker.palette"
+local highlights = require "onedarker.highlights"
+local Treesitter = require "onedarker.Treesitter"
+local markdown = require "onedarker.markdown"
+local Whichkey = require "onedarker.Whichkey"
+local Git = require "onedarker.Git"
+local LSP = require "onedarker.LSP"
+
+local skeletons = {
+  highlights,
+  Treesitter,
+  markdown,
+  Whichkey,
+  Git,
+  LSP,
+}
+
+for _, skeleton in ipairs(skeletons) do
+  util.initialise(skeleton)
+end
diff --git a/lua/spacegray/markdown.lua b/lua/onedarker/markdown.lua
index 2b83e056..2b83e056 100644
--- a/lua/spacegray/markdown.lua
+++ b/lua/onedarker/markdown.lua
diff --git a/lua/spacegray/palette.lua b/lua/onedarker/palette.lua
index 924482fd..c3116b1e 100644
--- a/lua/spacegray/palette.lua
+++ b/lua/onedarker/palette.lua
@@ -1,27 +1,26 @@
 local colors = {
-  fg = "#ABB2BF",
-  bg = "#202020",
-  alt_bg = "#262626",
-  dark = "#222222",
-  accent = "#AAAAAA",
-  popup_back = "#2D2D30",
+  fg = "#abb2bf",
+  bg = "#1f2227",
+  alt_bg = "#282c34",
+  dark = "#282c34",
+  accent = "#BBBBBB",
+  dark_gray = "#2a2f3e",
+  context = "#4b5263",
+  popup_back = "#282c34",
   search_orange = "#613214",
   search_blue = "#5e81ac",
-  white = "#D8DEE9",
-  gray = "#9BA1AB",
-  light_gray = "#c8c9c1",
-  blue = "#5f8ccd",
+  gray = "#5c6370",
+  light_gray = "#abb2bf",
+  blue = "#61AFEF",
   dark_blue = "#223E55",
-  light_blue = "#8dc0d5",
-  green = "#83ba8b",
-  cyan = "#4EC9B0",
-  light_green = "#B5CEA8",
-  red = "#D16969",
-  orange = "#D1866B",
-  light_red = "#CA535F",
-  yellow = "#ECCC8E",
+  green = "#98C379",
+  cyan = "#56B6C2",
+  red = "#e06c75",
+  orange = "#D19A66",
+  light_red = "#be5046",
+  yellow = "#E5C07B",
   yellow_orange = "#D7BA7D",
-  purple = "#BF82B4",
+  purple = "#C678DD",
   magenta = "#D16D9E",
   cursor_fg = "#515052",
   cursor_bg = "#AEAFAD",
diff --git a/lua/spacegray/util.lua b/lua/onedarker/util.lua
index dbac18a2..dbac18a2 100644
--- a/lua/spacegray/util.lua
+++ b/lua/onedarker/util.lua
diff --git a/lua/spacegray/Treesitter.lua b/lua/spacegray/Treesitter.lua
deleted file mode 100644
index 4e5ce16e..00000000
--- a/lua/spacegray/Treesitter.lua
+++ /dev/null
@@ -1,56 +0,0 @@
-local Treesitter = {
-  TSComment = { fg = C.gray },
-  TSAnnotation = { fg = C.purple },
-  TSAttribute = { fg = C.cyan },
-  TSConstructor = { fg = C.purple },
-  TSType = { fg = C.purple },
-  TSTypeBuiltin = { fg = C.purple },
-  TSConditional = { fg = C.blue },
-  TSException = { fg = C.blue },
-  TSInclude = { fg = C.blue },
-  TSKeyword = { fg = C.blue },
-  TSKeywordFunction = { fg = C.blue },
-  TSLabel = { fg = C.blue },
-  TSNamespace = { fg = C.blue },
-  TSRepeat = { fg = C.blue },
-  TSConstant = { fg = C.orange },
-  TSConstBuiltin = { fg = C.red },
-  TSFloat = { fg = C.red },
-  TSNumber = { fg = C.red },
-  TSBoolean = { fg = C.red },
-  TSCharacter = { fg = C.light_green },
-  TSError = { fg = C.error_red },
-  TSFunction = { fg = C.yellow },
-  TSFuncBuiltin = { fg = C.yellow },
-  TSMethod = { fg = C.yellow },
-  TSConstMacro = { fg = C.cyan },
-  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.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.yellow_orange },
-  TSURI = { fg = C.yellow_orange, style = "underline" },
-  TSKeywordOperator = { fg = C.blue },
-  TSStructure = { fg = C.light_blue },
-  TSStrong = { fg = C.yellow_orange },
-  TSQueryLinterError = { fg = C.warning_orange },
-}
-
-return Treesitter
diff --git a/lua/spacegray/init.lua b/lua/spacegray/init.lua
deleted file mode 100644
index 9ae24dbb..00000000
--- a/lua/spacegray/init.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-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 = "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"
-local Whichkey = require "spacegray.Whichkey"
-local Git = require "spacegray.Git"
-local LSP = require "spacegray.LSP"
-
-local skeletons = {
-  highlights,
-  Treesitter,
-  markdown,
-  Whichkey,
-  Git,
-  LSP,
-}
-
-for _, skeleton in ipairs(skeletons) do
-  util.initialise(skeleton)
-end
-
-async:send()