Compare commits

..

No commits in common. "4f7cde15eef18fe090b07cc9decf8ddaa25869fc" and "745cb177518b0261c6caecfe92bc03d379074f71" have entirely different histories.

2 changed files with 62 additions and 93 deletions

View File

@ -3,64 +3,49 @@ local hsl = lush.hsl -- We'll use hsl a lot so its nice to bind it separately
---@diagnostic disable: undefined-global ---@diagnostic disable: undefined-global
local theme = lush(function() local theme = lush(function()
local base = hsl(210, 40, 75)
local red = base.hue(0)
local orange = base.hue(30)
local yellow = base.hue(60)
local yellow_green = base.hue(90)
local green = base.hue(120)
local aquamarine = base.hue(150)
local cyan = base.hue(180)
local blue = base.hue(210)
local lavender = base.hue(240)
local purple = base.hue(270)
local fuchsia = base.hue(300)
local hot_pink = base.hue(330)
return { return {
-- See: h highlight-groups -- See: h highlight-groups
Normal { bg = hsl(base.h, 15, 20), fg = hsl(base.h, 30, 75) }, Normal { bg = hsl(210, 15, 20), fg = hsl(210, 20, 75) },
CursorLine { bg = Normal.bg.li(10) }, CursorLine { bg = Normal.bg.li(10) },
Visual { bg = hsl(base.h, 30, 30) }, Visual { bg = hsl(210, 30, 30) },
Comment { fg = hsl(base.h, 10, 60) }, Comment { fg = hsl(210, 10, 60) },
CursorColumn { CursorLine }, CursorColumn { CursorLine },
LineNr { Comment, gui = "italic" }, LineNr { Comment, gui = "italic" },
CursorLineNr { fg = blue, bg = CursorLine.bg, gui = "italic" }, CursorLineNr { fg = hsl(210, 50, 75), bg = CursorLine.bg, gui = "italic" },
Search { bg = yellow, fg = Normal.bg }, Search { bg = hsl(50, 15, 60), fg = Normal.bg },
IncSearch { bg = yellow_green, fg = Normal.bg }, IncSearch { bg = hsl(130, 15, 60), fg = Normal.bg },
String { fg = blue }, String { fg = hsl(210, 50, 75) },
PreProc { fg = lavender }, PreProc { fg = hsl(300, 50, 75) },
Statement { fg = orange }, Statement { fg = hsl(10, 50, 75) },
Type { fg = yellow }, Type { fg = hsl(50, 50, 75) },
Identifier { fg = Normal.fg }, Identifier { fg = Normal.fg },
Function { fg = green }, Function { fg = hsl(130, 50, 75) },
Operator { fg = aquamarine }, Operator { fg = hsl(270, 50, 75) },
Special { fg = purple }, Special { fg = hsl(325, 50, 75) },
Constant { fg = cyan }, Constant { fg = hsl(185, 50, 75) },
NonText { fg = Normal.bg.li(10) }, NonText { fg = Normal.bg.li(10) },
DiffAdd { fg = green }, DiffAdd { Function },
DiffDelete { fg = red }, DiffDelete { Special },
diffRemoved { fg = red }, DiffChange { String },
DiffChange { fg = blue },
diffChanged { fg = blue },
SignColumn { Normal }, SignColumn { Normal },
diffAdded { DiffAdd }, diffAdded { DiffAdd },
MoreMsg { fg = green, gui = "bold" }, MoreMsg { Function, gui = "bold" },
Question { fg = green, gui = "bold" }, Question { Function, gui = "bold" },
TelescopeSelection { CursorLine }, TelescopeSelection { CursorLine },
WhichKeyFloat { bg = hsl(base.h, 15, 30) }, WhichKeyFloat { bg = hsl(210, 15, 30) },
DiagnosticError { fg = red }, DiagnosticError { fg = hsl(0, 80, 75) },
DiagnosticWarn { fg = orange }, DiagnosticWarn { fg = hsl(25, 80, 75) },
DiagnosticInfo { fg = cyan }, DiagnosticInfo { fg = hsl(195, 80, 75) },
Pmenu { bg = blue.da(45).de(45) }, Pmenu { bg = Normal.bg.li(20) },
PmenuSel { bg = blue.da(45) }, PmenuSel { bg = Normal.bg.li(30) },
Error { bg = red.da(25), fg = Normal.bg }, Error { bg = hsl(0, 50, 50), fg = Normal.fg },
ErrorMsg { Error }, ErrorMsg { Error },
MatchParen { fg = hot_pink, gui = "bold" }, MatchParen { bg = hsl(195, 50, 35), fg = Normal.fg },
SpecialKey { fg = red }, SpecialKey { fg = "red" },
Directory { fg = cyan }, Directory { Constant },
Title { fg = fuchsia, gui = "bold" }, Title { Operator, gui = "bold" },
Conceal { bg = blue.da(40).de(50) }, Conceal { bg = Normal.bg.li(40).de(30) },
SpellBad { fg = red, gui = "underline" }, SpellBad { fg = Special.fg, gui = "underline" },
SpellRare { fg = Type.fg, gui = "underline" }, SpellRare { fg = Type.fg, gui = "underline" },
SpellLocal { fg = DiagnosticInfo.fg, gui = "underline" }, SpellLocal { fg = DiagnosticInfo.fg, gui = "underline" },
SpellCap { fg = String.fg, gui = "underline" }, SpellCap { fg = String.fg, gui = "underline" },

View File

@ -3,71 +3,55 @@ local hsl = lush.hsl -- We'll use hsl a lot so its nice to bind it separately
---@diagnostic disable: undefined-global ---@diagnostic disable: undefined-global
local theme = lush(function() local theme = lush(function()
local base = hsl(210, 50, 35)
local red = base.hue(0)
local orange = base.hue(30)
local yellow = base.hue(60)
local yellow_green = base.hue(90)
local green = base.hue(120)
local aquamarine = base.hue(150)
local cyan = base.hue(180)
local blue = base.hue(210)
local lavender = base.hue(240)
local purple = base.hue(270)
local fuchsia = base.hue(300)
local hot_pink = base.hue(330)
return { return {
-- See: h highlight-groups -- See: h highlight-groups
Normal { bg = hsl(base.h, 25, 97), fg = hsl(blue.h, 30, 20) }, Normal { bg = hsl(210, 25, 97), fg = hsl(210, 30, 20) },
CursorLine { bg = Normal.bg.da(4) }, CursorLine { bg = Normal.bg.da(4) },
Visual { bg = base.de(55).li(65) }, Visual { bg = hsl(210, 30, 75) },
Comment { fg = base.de(60).li(20) }, Comment { fg = hsl(210, 10, 50) },
CursorColumn { CursorLine }, CursorColumn { CursorLine },
LineNr { Comment, gui = "italic" }, LineNr { Comment, gui = "italic" },
CursorLineNr { fg = blue, bg = CursorLine.bg, gui = "italic" }, CursorLineNr { fg = hsl(210, 50, 30), bg = CursorLine.bg, gui = "italic" },
Search { bg = yellow, fg = Normal.bg }, Search { bg = hsl(50, 15, 60), fg = Normal.fg },
IncSearch { bg = yellow_green, fg = Normal.bg }, IncSearch { bg = hsl(130, 15, 60), fg = Normal.fg },
String { fg = blue }, String { fg = hsl(210, 50, 35) },
PreProc { fg = lavender }, PreProc { fg = hsl(300, 50, 35) },
Statement { fg = orange }, Statement { fg = hsl(10, 50, 35) },
Type { fg = yellow }, Type { fg = hsl(50, 50, 35) },
Identifier { fg = Normal.fg }, Identifier { fg = Normal.fg },
Function { fg = green }, Function { fg = hsl(130, 50, 35) },
Operator { fg = aquamarine }, Operator { fg = hsl(270, 50, 35) },
Special { fg = purple }, Special { fg = hsl(325, 50, 35) },
Constant { fg = cyan }, Constant { fg = hsl(195, 50, 35) },
NonText { fg = Normal.bg.li(10) }, NonText { fg = Normal.bg.li(10) },
DiffAdd { fg = green }, DiffAdd { Function },
DiffDelete { fg = red }, DiffDelete { Special },
diffRemoved { fg = red }, DiffChange { String },
DiffChange { fg = blue },
diffChanged { fg = blue },
SignColumn { Normal }, SignColumn { Normal },
diffAdded { DiffAdd }, diffAdded { DiffAdd },
MoreMsg { fg = green, gui = "bold" }, MoreMsg { Function, gui = "bold" },
Question { fg = green, gui = "bold" }, Question { Function, gui = "bold" },
TelescopeSelection { CursorLine }, TelescopeSelection { CursorLine },
WhichKeyFloat { bg = Normal.bg.da(5) }, WhichKeyFloat { bg = Normal.bg.da(5) },
DiagnosticError { fg = red }, DiagnosticError { fg = hsl(0, 80, 35) },
DiagnosticWarn { fg = orange }, DiagnosticWarn { fg = hsl(25, 80, 35) },
DiagnosticInfo { fg = cyan }, DiagnosticInfo { fg = hsl(195, 80, 35) },
Pmenu { bg = Normal.bg.da(5) }, Pmenu { bg = Normal.bg.da(5) },
PmenuSel { bg = Normal.bg.da(15) }, PmenuSel { bg = Normal.bg.da(10) },
Error { bg = red.da(25), fg = Normal.bg }, Error { bg = hsl(0, 50, 65), fg = Normal.fg },
ErrorMsg { Error }, ErrorMsg { Error },
MatchParen { fg = hot_pink, gui = "bold" }, MatchParen { bg = hsl(195, 50, 65), fg = Normal.fg },
SpecialKey { fg = red }, SpecialKey { fg = "red" },
Directory { fg = cyan }, Directory { Constant },
Title { fg = fuchsia, gui = "bold" }, Title { Operator, gui = "bold" },
Conceal { bg = Normal.bg.da(15).de(30) }, Conceal { bg = Normal.bg.da(15).de(30) },
SpellBad { fg = red, gui = "underline" }, SpellBad { fg = Special.fg, gui = "underline" },
SpellRare { fg = Type.fg, gui = "underline" }, SpellRare { fg = Type.fg, gui = "underline" },
SpellLocal { fg = DiagnosticInfo.fg, gui = "underline" }, SpellLocal { fg = Constant.fg, gui = "underline" },
SpellCap { fg = String.fg, gui = "underline" }, SpellCap { fg = String.fg, gui = "underline" },
} }
end) end)
return theme return theme
-- vi:nowrap:number -- vi:nowrap:number