style: adopt stylua formatting as default
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
local function get(setting, default)
|
local function get(setting, default)
|
||||||
local key = "tokyodark_" .. setting
|
local key = "tokyodark_" .. setting
|
||||||
if vim.g[key] == nil then return default end
|
if vim.g[key] == nil then
|
||||||
|
return default
|
||||||
|
end
|
||||||
return vim.g[key]
|
return vim.g[key]
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -8,7 +10,7 @@ local config = {
|
|||||||
bg = get("transparent_background", false),
|
bg = get("transparent_background", false),
|
||||||
italic = get("enable_italic", true),
|
italic = get("enable_italic", true),
|
||||||
italic_comment = get("enable_italic_comment", true),
|
italic_comment = get("enable_italic_comment", true),
|
||||||
gamma = get("color_gamma", "1.0")
|
gamma = get("color_gamma", "1.0"),
|
||||||
}
|
}
|
||||||
|
|
||||||
return config
|
return config
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
local p = require('tokyodark.palette')
|
local p = require("tokyodark.palette")
|
||||||
local cfg = require('tokyodark.config')
|
local cfg = require("tokyodark.config")
|
||||||
local u = require('tokyodark.utils')
|
local u = require("tokyodark.utils")
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
local hl = { langs = {}, plugins = {} }
|
local hl = { langs = {}, plugins = {} }
|
||||||
@@ -28,7 +28,7 @@ hl.predef = {
|
|||||||
GreenItalic = { fg = p.green, italic = cfg.italic },
|
GreenItalic = { fg = p.green, italic = cfg.italic },
|
||||||
OrangeItalic = { fg = p.orange, italic = cfg.italic },
|
OrangeItalic = { fg = p.orange, italic = cfg.italic },
|
||||||
RedItalic = { fg = p.red, italic = cfg.italic },
|
RedItalic = { fg = p.red, italic = cfg.italic },
|
||||||
YellowItalic = {fg = p.yellow, italic = cfg.italic}
|
YellowItalic = { fg = p.yellow, italic = cfg.italic },
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.common = {
|
hl.common = {
|
||||||
@@ -88,7 +88,7 @@ hl.common = {
|
|||||||
Debug = { fg = p.yellow },
|
Debug = { fg = p.yellow },
|
||||||
debugPC = { fg = p.bg0, bg = p.green },
|
debugPC = { fg = p.bg0, bg = p.green },
|
||||||
debugBreakpoint = { fg = p.bg0, bg = p.red },
|
debugBreakpoint = { fg = p.bg0, bg = p.red },
|
||||||
ToolbarButton = {fg = p.bg0, bg = p.bg_blue}
|
ToolbarButton = { fg = p.bg0, bg = p.bg_blue },
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.syntax = {
|
hl.syntax = {
|
||||||
@@ -124,7 +124,7 @@ hl.syntax = {
|
|||||||
Delimiter = hl.predef.Fg,
|
Delimiter = hl.predef.Fg,
|
||||||
Comment = { fg = p.bg4, italic = cfg.italic_comment },
|
Comment = { fg = p.bg4, italic = cfg.italic_comment },
|
||||||
SpecialComment = { fg = p.bg4, italic = cfg.italic_comment },
|
SpecialComment = { fg = p.bg4, italic = cfg.italic_comment },
|
||||||
Todo = {fg = p.blue, italic = cfg.italic_comment}
|
Todo = { fg = p.blue, italic = cfg.italic_comment },
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.plugins.lsp = {
|
hl.plugins.lsp = {
|
||||||
@@ -140,20 +140,20 @@ hl.plugins.lsp = {
|
|||||||
LspDiagnosticsUnderlineError = { underline = true, sp = u.color_gamma(p.red, 0.5) },
|
LspDiagnosticsUnderlineError = { underline = true, sp = u.color_gamma(p.red, 0.5) },
|
||||||
LspDiagnosticsUnderlineHint = { underline = true, sp = u.color_gamma(p.purple, 0.5) },
|
LspDiagnosticsUnderlineHint = { underline = true, sp = u.color_gamma(p.purple, 0.5) },
|
||||||
LspDiagnosticsUnderlineInformation = { underline = true, sp = u.color_gamma(p.blue, 0.5) },
|
LspDiagnosticsUnderlineInformation = { underline = true, sp = u.color_gamma(p.blue, 0.5) },
|
||||||
LspDiagnosticsUnderlineWarning = {underline = true, sp = u.color_gamma(p.yellow, 0.5)}
|
LspDiagnosticsUnderlineWarning = { underline = true, sp = u.color_gamma(p.yellow, 0.5) },
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.plugins.whichkey = {
|
hl.plugins.whichkey = {
|
||||||
WhichKey = hl.predef.Red,
|
WhichKey = hl.predef.Red,
|
||||||
WhichKeyDesc = hl.predef.Blue,
|
WhichKeyDesc = hl.predef.Blue,
|
||||||
WhichKeyGroup = hl.predef.Orange,
|
WhichKeyGroup = hl.predef.Orange,
|
||||||
WhichKeySeperator = hl.predef.Green
|
WhichKeySeperator = hl.predef.Green,
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.plugins.gitgutter = {
|
hl.plugins.gitgutter = {
|
||||||
GitGutterAdd = { fg = p.diff_green },
|
GitGutterAdd = { fg = p.diff_green },
|
||||||
GitGutterChange = { fg = p.diff_blue },
|
GitGutterChange = { fg = p.diff_blue },
|
||||||
GitGutterDelete = {fg = p.diff_red}
|
GitGutterDelete = { fg = p.diff_red },
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.plugins.diffview = {
|
hl.plugins.diffview = {
|
||||||
@@ -180,13 +180,13 @@ hl.plugins.diffview = {
|
|||||||
DiffviewStatusUnmerged = hl.predef.Blue,
|
DiffviewStatusUnmerged = hl.predef.Blue,
|
||||||
DiffviewStatusUnknown = hl.predef.Red,
|
DiffviewStatusUnknown = hl.predef.Red,
|
||||||
DiffviewStatusDeleted = hl.predef.Red,
|
DiffviewStatusDeleted = hl.predef.Red,
|
||||||
DiffviewStatusBroken = hl.predef.Red
|
DiffviewStatusBroken = hl.predef.Red,
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.plugins.treesitter = {
|
hl.plugins.treesitter = {
|
||||||
commentTSDanger = hl.predef.RedItalic,
|
commentTSDanger = hl.predef.RedItalic,
|
||||||
commentTSNote = hl.predef.BlueItalic,
|
commentTSNote = hl.predef.BlueItalic,
|
||||||
commentTSWarning = hl.predef.YellowItalic
|
commentTSWarning = hl.predef.YellowItalic,
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.plugins.gitsigns = {
|
hl.plugins.gitsigns = {
|
||||||
@@ -198,7 +198,7 @@ hl.plugins.gitsigns = {
|
|||||||
GitSignsChangeNr = hl.predef.Blue,
|
GitSignsChangeNr = hl.predef.Blue,
|
||||||
GitSignsDelete = hl.predef.Red,
|
GitSignsDelete = hl.predef.Red,
|
||||||
GitSignsDeleteLn = hl.predef.Red,
|
GitSignsDeleteLn = hl.predef.Red,
|
||||||
GitSignsDeleteNr = hl.predef.Red
|
GitSignsDeleteNr = hl.predef.Red,
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.langs.markdown = {
|
hl.langs.markdown = {
|
||||||
@@ -228,7 +228,7 @@ hl.langs.markdown = {
|
|||||||
markdownRule = hl.predef.Purple,
|
markdownRule = hl.predef.Purple,
|
||||||
markdownUrl = { fg = p.blue, underline = true },
|
markdownUrl = { fg = p.blue, underline = true },
|
||||||
markdownUrlDelimiter = hl.predef.Grey,
|
markdownUrlDelimiter = hl.predef.Grey,
|
||||||
markdownUrlTitleDelimiter = hl.predef.Green
|
markdownUrlTitleDelimiter = hl.predef.Green,
|
||||||
}
|
}
|
||||||
|
|
||||||
hl.langs.scala = {
|
hl.langs.scala = {
|
||||||
@@ -237,7 +237,7 @@ hl.langs.scala = {
|
|||||||
scalaInterpolation = hl.predef.Purple,
|
scalaInterpolation = hl.predef.Purple,
|
||||||
scalaTypeOperator = hl.predef.Red,
|
scalaTypeOperator = hl.predef.Red,
|
||||||
scalaOperator = hl.predef.Red,
|
scalaOperator = hl.predef.Red,
|
||||||
scalaKeywordModifier = hl.predef.Red
|
scalaKeywordModifier = hl.predef.Red,
|
||||||
}
|
}
|
||||||
|
|
||||||
function M.clear_namespace()
|
function M.clear_namespace()
|
||||||
@@ -249,15 +249,23 @@ local function load_sync()
|
|||||||
load_highlights(hl.predef)
|
load_highlights(hl.predef)
|
||||||
load_highlights(hl.common)
|
load_highlights(hl.common)
|
||||||
load_highlights(hl.syntax)
|
load_highlights(hl.syntax)
|
||||||
for _, group in pairs(hl.langs) do load_highlights(group) end
|
for _, group in pairs(hl.langs) do
|
||||||
for _, group in pairs(hl.plugins) do load_highlights(group) end
|
load_highlights(group)
|
||||||
|
end
|
||||||
|
for _, group in pairs(hl.plugins) do
|
||||||
|
load_highlights(group)
|
||||||
|
end
|
||||||
set_hl_ns(ns)
|
set_hl_ns(ns)
|
||||||
end
|
end
|
||||||
|
|
||||||
local load_async
|
local load_async
|
||||||
load_async = vim.loop.new_async(vim.schedule_wrap(function()
|
load_async = vim.loop.new_async(vim.schedule_wrap(function()
|
||||||
for _, group in pairs(hl.langs) do load_highlights(group) end
|
for _, group in pairs(hl.langs) do
|
||||||
for _, group in pairs(hl.plugins) do load_highlights(group) end
|
load_highlights(group)
|
||||||
|
end
|
||||||
|
for _, group in pairs(hl.plugins) do
|
||||||
|
load_highlights(group)
|
||||||
|
end
|
||||||
set_hl_ns(ns)
|
set_hl_ns(ns)
|
||||||
load_async:close()
|
load_async:close()
|
||||||
end))
|
end))
|
||||||
@@ -268,4 +276,3 @@ function M.setup()
|
|||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +1,20 @@
|
|||||||
local highlights = require('tokyodark.highlights')
|
local highlights = require("tokyodark.highlights")
|
||||||
local terminal = require('tokyodark.terminal')
|
local terminal = require("tokyodark.terminal")
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
|
|
||||||
function M.colorscheme()
|
function M.colorscheme()
|
||||||
vim.cmd("hi clear")
|
vim.cmd("hi clear")
|
||||||
if vim.fn.exists("syntax_on") then vim.cmd("syntax reset") end
|
if vim.fn.exists("syntax_on") then
|
||||||
|
vim.cmd("syntax reset")
|
||||||
|
end
|
||||||
vim.o.background = "dark"
|
vim.o.background = "dark"
|
||||||
vim.o.termguicolors = true
|
vim.o.termguicolors = true
|
||||||
vim.g.colors_name = "tokyodark"
|
vim.g.colors_name = "tokyodark"
|
||||||
highlights.setup()
|
highlights.setup()
|
||||||
terminal.setup()
|
terminal.setup()
|
||||||
|
|
||||||
vim.cmd [[au ColorSchemePre * lua require("tokyodark.highlights").clear_namespace()]]
|
vim.cmd([[au ColorSchemePre * lua require("tokyodark.highlights").clear_namespace()]])
|
||||||
end
|
end
|
||||||
|
|
||||||
return M
|
return M
|
||||||
|
|||||||
@@ -1,37 +1,39 @@
|
|||||||
local color_gamma = require('tokyodark.utils').color_gamma
|
local color_gamma = require("tokyodark.utils").color_gamma
|
||||||
local gamma = require('tokyodark.config').gamma
|
local gamma = require("tokyodark.config").gamma
|
||||||
|
|
||||||
local colors = {
|
local colors = {
|
||||||
black = '#06080A',
|
black = "#06080A",
|
||||||
bg0 = '#11121D',
|
bg0 = "#11121D",
|
||||||
bg1 = '#1A1B2A',
|
bg1 = "#1A1B2A",
|
||||||
bg2 = '#212234',
|
bg2 = "#212234",
|
||||||
bg3 = '#392B41',
|
bg3 = "#392B41",
|
||||||
bg4 = '#4A5057',
|
bg4 = "#4A5057",
|
||||||
bg5 = '#282c34',
|
bg5 = "#282c34",
|
||||||
bg_red = '#FE6D85',
|
bg_red = "#FE6D85",
|
||||||
bg_green = '#98C379',
|
bg_green = "#98C379",
|
||||||
bg_blue = '#9FBBF3',
|
bg_blue = "#9FBBF3",
|
||||||
diff_red = '#773440',
|
diff_red = "#773440",
|
||||||
diff_green = '#587738',
|
diff_green = "#587738",
|
||||||
diff_blue = '#354A77',
|
diff_blue = "#354A77",
|
||||||
diff_add = '#1E2326',
|
diff_add = "#1E2326",
|
||||||
diff_change = '#262b3d',
|
diff_change = "#262b3d",
|
||||||
diff_delete = '#281B27',
|
diff_delete = "#281B27",
|
||||||
fg = '#A0A8CD',
|
fg = "#A0A8CD",
|
||||||
red = '#EE6D85',
|
red = "#EE6D85",
|
||||||
orange = '#F6955B',
|
orange = "#F6955B",
|
||||||
yellow = '#D7A65F',
|
yellow = "#D7A65F",
|
||||||
green = '#95C561',
|
green = "#95C561",
|
||||||
blue = '#7199EE',
|
blue = "#7199EE",
|
||||||
cyan = '#38A89D',
|
cyan = "#38A89D",
|
||||||
purple = '#A485DD',
|
purple = "#A485DD",
|
||||||
grey = '#4A5057',
|
grey = "#4A5057",
|
||||||
none = 'NONE'
|
none = "NONE",
|
||||||
}
|
}
|
||||||
local function gamma_correction(colors)
|
local function gamma_correction(colors)
|
||||||
local colors_corrected = {}
|
local colors_corrected = {}
|
||||||
for k, v in pairs(colors) do colors_corrected[k] = color_gamma(v, gamma) end
|
for k, v in pairs(colors) do
|
||||||
|
colors_corrected[k] = color_gamma(v, gamma)
|
||||||
|
end
|
||||||
return colors_corrected
|
return colors_corrected
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
local U = {}
|
local U = {}
|
||||||
|
|
||||||
function U.tprint(tbl, indent)
|
function U.tprint(tbl, indent)
|
||||||
if not indent then indent = 0 end
|
if not indent then
|
||||||
|
indent = 0
|
||||||
|
end
|
||||||
for k, v in pairs(tbl) do
|
for k, v in pairs(tbl) do
|
||||||
local formatting = string.rep(" ", indent) .. k .. ": "
|
local formatting = string.rep(" ", indent) .. k .. ": "
|
||||||
if type(v) == "table" then
|
if type(v) == "table" then
|
||||||
print(formatting)
|
print(formatting)
|
||||||
U.tprint(v, indent + 1)
|
U.tprint(v, indent + 1)
|
||||||
elseif type(v) == 'boolean' then
|
elseif type(v) == "boolean" then
|
||||||
print(formatting .. tostring(v))
|
print(formatting .. tostring(v))
|
||||||
else
|
else
|
||||||
print(formatting .. v)
|
print(formatting .. v)
|
||||||
@@ -17,8 +19,7 @@ end
|
|||||||
|
|
||||||
function U.hex2rgb(hex)
|
function U.hex2rgb(hex)
|
||||||
hex = hex:gsub("#", "")
|
hex = hex:gsub("#", "")
|
||||||
return tonumber("0x" .. hex:sub(1, 2)), tonumber("0x" .. hex:sub(3, 4)),
|
return tonumber("0x" .. hex:sub(1, 2)), tonumber("0x" .. hex:sub(3, 4)), tonumber("0x" .. hex:sub(5, 6))
|
||||||
tonumber("0x" .. hex:sub(5, 6))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function U.gamma_corrector(value, gamma)
|
function U.gamma_corrector(value, gamma)
|
||||||
@@ -27,7 +28,7 @@ function U.gamma_corrector(value, gamma)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function U.color_gamma(hex, gamma)
|
function U.color_gamma(hex, gamma)
|
||||||
if hex:find('#') == nil then
|
if hex:find("#") == nil then
|
||||||
return hex
|
return hex
|
||||||
end
|
end
|
||||||
local r, g, b = U.hex2rgb(hex)
|
local r, g, b = U.hex2rgb(hex)
|
||||||
|
|||||||
Reference in New Issue
Block a user