Compare commits
2 commits
dba1edef82
...
ab19e26648
| Author | SHA1 | Date | |
|---|---|---|---|
| ab19e26648 | |||
| f407e2999a |
1 changed files with 148 additions and 114 deletions
224
lua/gruvbox.lua
224
lua/gruvbox.lua
|
|
@ -4,9 +4,10 @@ M.colors = function()
|
||||||
local c = { -- 16 | 16 | 256 |
|
local c = { -- 16 | 16 | 256 |
|
||||||
-- dark | light | colors | R G B
|
-- dark | light | colors | R G B
|
||||||
--------+-------+--------+---------------
|
--------+-------+--------+---------------
|
||||||
dark0_h = '#1d2021', -- | | 233 | 29 32 33
|
dark0 = '#1d2021', -- | | 233 | 29 32 33
|
||||||
dark0 = '#282828', -- 0 | | 235 | 40 40 40
|
--dark0_h = '#1d2021', -- | | 233 | 29 32 33
|
||||||
dark0_s = '#32302f', -- | | 236 | 50 48 47
|
--dark0 = '#282828', -- 0 | | 235 | 40 40 40
|
||||||
|
--dark0_s = '#32302f', -- | | 236 | 50 48 47
|
||||||
dark1 = '#3c3836', -- | 15 | 237 | 60 56 54
|
dark1 = '#3c3836', -- | 15 | 237 | 60 56 54
|
||||||
dark2 = '#504945', -- | | 239 | 80 73 69
|
dark2 = '#504945', -- | | 239 | 80 73 69
|
||||||
dark3 = '#665c54', -- | | 241 | 102 92 84
|
dark3 = '#665c54', -- | | 241 | 102 92 84
|
||||||
|
|
@ -16,17 +17,26 @@ M.colors = function()
|
||||||
light3 = '#bdae93', -- | | 248 | 189 174 147
|
light3 = '#bdae93', -- | | 248 | 189 174 147
|
||||||
light2 = '#d5c4a1', -- | | 250 | 213 196 161
|
light2 = '#d5c4a1', -- | | 250 | 213 196 161
|
||||||
light1 = '#ebdbb2', -- 15 | | 223 | 235 219 178
|
light1 = '#ebdbb2', -- 15 | | 223 | 235 219 178
|
||||||
light0_s = '#f2e5bc', -- | | 228 | 242 229 188
|
--light0_s = '#f2e5bc', -- | | 228 | 242 229 188
|
||||||
light0 = '#fbf1c7', -- | 0 | 229 | 253 244 193
|
--light0 = '#fbf1c7', -- | 0 | 229 | 253 244 193
|
||||||
light0_h = '#f9f5d7', -- | | 230 | 249 245 215
|
--light0_h = '#f9f5d7', -- | | 230 | 249 245 215
|
||||||
|
light0 = '#f9f5d7', -- | | 230 | 249 245 215
|
||||||
|
|
||||||
red_dark = '#9d0006', -- | 9 | 88 | 157 0 6
|
red_darkest = '#2e100f',
|
||||||
green_dark = '#79740e', -- | 10 | 100 | 121 116 14
|
green_darkest = '#2e2e0f',
|
||||||
yellow_dark = '#b57614', -- | 11 | 136 | 181 118 20
|
yellow_darkest = '#2e240f',
|
||||||
blue_dark = '#076678', -- | 12 | 24 | 6 102 120
|
blue_darkest = '#142829',
|
||||||
purple_dark = '#8f3f71', -- | 13 | 96 | 143 63 113
|
purple_darkest = '#29141e',
|
||||||
aqua_dark = '#427b58', -- | 14 | 66 | 66 123 88
|
aqua_darkest = '#182519',
|
||||||
orange_dark = '#af3a03', -- | | 130 | 175 58 3
|
orange_darkest = '#321a0b',
|
||||||
|
|
||||||
|
red_darker = '#9d0006', -- | 9 | 88 | 157 0 6
|
||||||
|
green_darker = '#79740e', -- | 10 | 100 | 121 116 14
|
||||||
|
yellow_darker = '#b57614', -- | 11 | 136 | 181 118 20
|
||||||
|
blue_darker = '#076678', -- | 12 | 24 | 6 102 120
|
||||||
|
purple_darker = '#8f3f71', -- | 13 | 96 | 143 63 113
|
||||||
|
aqua_darker = '#427b58', -- | 14 | 66 | 66 123 88
|
||||||
|
orange_darker = '#af3a03', -- | | 130 | 175 58 3
|
||||||
|
|
||||||
red = '#cc241d', -- 1 | 1 | 123 | 204 36 29
|
red = '#cc241d', -- 1 | 1 | 123 | 204 36 29
|
||||||
green = '#98971a', -- 2 | 2 | 106 | 152 151 26
|
green = '#98971a', -- 2 | 2 | 106 | 152 151 26
|
||||||
|
|
@ -36,64 +46,38 @@ M.colors = function()
|
||||||
aqua = '#689d6a', -- 6 | 6 | 72 | 104 157 106
|
aqua = '#689d6a', -- 6 | 6 | 72 | 104 157 106
|
||||||
orange = '#d65d0e', -- | | 166 | 214 93 14
|
orange = '#d65d0e', -- | | 166 | 214 93 14
|
||||||
|
|
||||||
red_light = '#fb4934', -- 9 | | 167 | 251 73 52
|
red_lighter = '#fb4934', -- 9 | | 167 | 251 73 52
|
||||||
green_light = '#b8bb26', -- 10 | | 142 | 184 187 38
|
green_lighter = '#b8bb26', -- 10 | | 142 | 184 187 38
|
||||||
yellow_light = '#fabd2f', -- 11 | | 214 | 250 189 47
|
yellow_lighter = '#fabd2f', -- 11 | | 214 | 250 189 47
|
||||||
blue_light = '#83a598', -- 12 | | 109 | 131 165 152
|
blue_lighter = '#83a598', -- 12 | | 109 | 131 165 152
|
||||||
purple_light = '#d3869b', -- 13 | | 175 | 211 134 155
|
purple_lighter = '#d3869b', -- 13 | | 175 | 211 134 155
|
||||||
aqua_light = '#8ec07c', -- 14 | | 108 | 142 192 124
|
aqua_lighter = '#8ec07c', -- 14 | | 108 | 142 192 124
|
||||||
orange_light = '#fe8019', -- | | 208 | 254 128 25
|
orange_lighter = '#fe8019', -- | | 208 | 254 128 25
|
||||||
|
|
||||||
|
red_lightest = '#ffd7d4',
|
||||||
|
green_lightest = '#eeeed2',
|
||||||
|
yellow_lightest = '#f3eace',
|
||||||
|
blue_lightest = '#d2e4e5',
|
||||||
|
purple_lightest = '#f2dee7',
|
||||||
|
aqua_lightest = '#d4e3d4',
|
||||||
|
orange_lightest = '#f3e0d3',
|
||||||
}
|
}
|
||||||
|
|
||||||
if vim.opt.background:get() == 'dark' then
|
local is_dark = vim.opt.background:get() == 'dark'
|
||||||
-- c.bg0 = c.dark0 -- default contrast
|
local palette = {}
|
||||||
-- c.bg0 = c.dark0_s -- soft contrast
|
|
||||||
c.bg0 = c.dark0_h -- hard contrast
|
|
||||||
|
|
||||||
c.bg1 = c.dark1
|
for i = 0, 4, 1 do
|
||||||
c.bg2 = c.dark2
|
palette['fg' .. tostring(i)] = c[(is_dark and 'light' or 'dark') .. tostring(i)]
|
||||||
c.bg3 = c.dark3
|
palette['bg' .. tostring(i)] = c[(is_dark and 'dark' or 'light') .. tostring(i)]
|
||||||
c.bg4 = c.dark4
|
|
||||||
|
|
||||||
c.fg0 = c.light0
|
|
||||||
c.fg1 = c.light1
|
|
||||||
c.fg2 = c.light2
|
|
||||||
c.fg3 = c.light3
|
|
||||||
c.fg4 = c.light4
|
|
||||||
|
|
||||||
c.red_faded = c.red_dark
|
|
||||||
c.green_faded = c.green_dark
|
|
||||||
c.yellow_faded = c.yellow_dark
|
|
||||||
c.blue_faded = c.blue_dark
|
|
||||||
c.purple_faded = c.purple_dark
|
|
||||||
c.aqua_faded = c.aqua_dark
|
|
||||||
c.orange_faded = c.orange_dark
|
|
||||||
else
|
|
||||||
c.bg0 = c.light0 -- default contrast
|
|
||||||
-- c.bg0 = c.light0_s -- soft contrast
|
|
||||||
-- c.bg0 = c.light0_h -- hard contrast
|
|
||||||
|
|
||||||
c.bg1 = c.light1
|
|
||||||
c.bg2 = c.light2
|
|
||||||
c.bg3 = c.light3
|
|
||||||
c.bg4 = c.light4
|
|
||||||
|
|
||||||
c.fg0 = c.dark0
|
|
||||||
c.fg1 = c.dark1
|
|
||||||
c.fg2 = c.dark2
|
|
||||||
c.fg3 = c.dark3
|
|
||||||
c.fg4 = c.dark4
|
|
||||||
|
|
||||||
c.red_faded = c.red_light
|
|
||||||
c.green_faded = c.green_light
|
|
||||||
c.yellow_faded = c.yellow_light
|
|
||||||
c.blue_faded = c.blue_light
|
|
||||||
c.purple_faded = c.purple_light
|
|
||||||
c.aqua_faded = c.aqua_light
|
|
||||||
c.orange_faded = c.orange_light
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return c
|
for _, accent in ipairs({'red', 'green', 'yellow', 'blue', 'purple', 'aqua', 'orange'}) do
|
||||||
|
palette[accent] = c[accent]
|
||||||
|
palette['br_' .. accent] = c[accent .. '_' .. (is_dark and 'lighter' or 'darker')]
|
||||||
|
palette[accent .. '_bg'] = c[accent .. '_' .. (is_dark and 'darkest' or 'lightest')]
|
||||||
|
end
|
||||||
|
|
||||||
|
return palette
|
||||||
end
|
end
|
||||||
|
|
||||||
M.highlights = function()
|
M.highlights = function()
|
||||||
|
|
@ -144,7 +128,7 @@ M.highlights = function()
|
||||||
SpecialComment = { link = 'Special' }, -- special things inside a comment
|
SpecialComment = { link = 'Special' }, -- special things inside a comment
|
||||||
Debug = { link = 'Special' }, -- debugging statements
|
Debug = { link = 'Special' }, -- debugging statements
|
||||||
|
|
||||||
Underlined = { fg = C.purple_faded, underline = true },
|
Underlined = { underline = true },
|
||||||
Ignore = { },
|
Ignore = { },
|
||||||
Todo = { fg = C.purple, bold = true },
|
Todo = { fg = C.purple, bold = true },
|
||||||
Error = { fg = C.red },
|
Error = { fg = C.red },
|
||||||
|
|
@ -173,16 +157,18 @@ M.highlights = function()
|
||||||
IncSearch = { fg = C.yellow, reverse = true },
|
IncSearch = { fg = C.yellow, reverse = true },
|
||||||
Search = { fg = C.fg4 , reverse = true },
|
Search = { fg = C.fg4 , reverse = true },
|
||||||
|
|
||||||
DiffAdd = { fg = C.green},
|
DiffAdd = { fg = C.green, bg = C.green_bg },
|
||||||
DiffChange = { fg = C.yellow},
|
DiffDelete = { fg = C.red, bg = C.red_bg },
|
||||||
DiffDelete = { fg = C.red},
|
DiffChange = { fg = C.yellow, bg = C.yellow_bg },
|
||||||
DiffText = { fg = C.orange},
|
DiffText = { fg = C.orange, bg = C.orange_bg },
|
||||||
|
diffFile = { fg = C.br_blue, bg = C.blue_bg },
|
||||||
|
diffIndexLine = { fg = C.blue },
|
||||||
|
diffNewFile = { link = 'diffIndexLine' },
|
||||||
|
diffOldFile = { link = 'diffIndexLine' },
|
||||||
|
diffLine = { fg = C.purple },
|
||||||
|
diffSubname = { link = 'diffLine' },
|
||||||
diffAdded = { link = 'DiffAdd' },
|
diffAdded = { link = 'DiffAdd' },
|
||||||
diffRemoved = { link = 'DiffDelete' },
|
diffRemoved = { link = 'DiffDelete' },
|
||||||
diffLine = { fg = C.purple },
|
|
||||||
diffSubname = { link = 'diffine' },
|
|
||||||
diffFile = { fg = C.blue },
|
|
||||||
diffIndexLine = { link = 'diffFile' },
|
|
||||||
|
|
||||||
SpellBad = { fg = C.orange, undercurl = true },
|
SpellBad = { fg = C.orange, undercurl = true },
|
||||||
SpellCap = { undercurl = true },
|
SpellCap = { undercurl = true },
|
||||||
|
|
@ -211,7 +197,7 @@ M.highlights = function()
|
||||||
TabLineFill = { fg = C.fg4 , bg = C.bg2 },
|
TabLineFill = { fg = C.fg4 , bg = C.bg2 },
|
||||||
TabLineSel = { fg = C.yellow, bg = bg },
|
TabLineSel = { fg = C.yellow, bg = bg },
|
||||||
|
|
||||||
MatchParen = { fg = C.red, bg = C.bg3, bold = true },
|
MatchParen = { fg = C.red, bg = C.reg_bg, bold = true },
|
||||||
},
|
},
|
||||||
|
|
||||||
pum = {
|
pum = {
|
||||||
|
|
@ -228,7 +214,7 @@ M.highlights = function()
|
||||||
helpSpecial = { link = 'Special' },
|
helpSpecial = { link = 'Special' },
|
||||||
vimSet = { link = 'Normal' },
|
vimSet = { link = 'Normal' },
|
||||||
vimSetEqual = { link = 'Normal' },
|
vimSetEqual = { link = 'Normal' },
|
||||||
vimCommentString = { fg = C.purple_faded },
|
vimCommentString = { fg = C.purple },
|
||||||
vimCommand = { fg = C.yellow },
|
vimCommand = { fg = C.yellow },
|
||||||
vimCmdSep = { fg = C.blue, bold = true },
|
vimCmdSep = { fg = C.blue, bold = true },
|
||||||
helpExample = { fg = C.fg3 },
|
helpExample = { fg = C.fg3 },
|
||||||
|
|
@ -252,11 +238,11 @@ M.highlights = function()
|
||||||
gitcommitSelected = { link = 'gitcommitComment' },
|
gitcommitSelected = { link = 'gitcommitComment' },
|
||||||
gitcommitOnBranch = { link = 'gitcommitComment' },
|
gitcommitOnBranch = { link = 'gitcommitComment' },
|
||||||
|
|
||||||
gitcommitBranch = { fg = C.blue, bg = C.bg1 },
|
gitcommitBranch = { fg = C.br_blue, bg = C.blue_bg },
|
||||||
gitcommitNoBranch = { link = 'gitcommitBranch' },
|
gitcommitNoBranch = { link = 'gitcommitBranch' },
|
||||||
|
|
||||||
gitcommitHeader = { fg = C.bg3 },
|
gitcommitHeader = { fg = C.bg4 },
|
||||||
gitcommitFile = { fg = C.fg4 },
|
gitcommitFile = { link = 'gitcommitHeader' },
|
||||||
|
|
||||||
gitcommitSelectedType = { fg = C.green },
|
gitcommitSelectedType = { fg = C.green },
|
||||||
gitcommitSelectedFile = { link = 'gitcommitSelectedType' },
|
gitcommitSelectedFile = { link = 'gitcommitSelectedType' },
|
||||||
|
|
@ -399,26 +385,26 @@ M.highlights = function()
|
||||||
|
|
||||||
-- 'tpope/vim-fugitive'
|
-- 'tpope/vim-fugitive'
|
||||||
fugitive = {
|
fugitive = {
|
||||||
fugitiveHeader = { link = 'Label' },
|
fugitiveHeader = { link = 'Comment' },
|
||||||
|
|
||||||
fugitiveHash = { fg = C.purple_faded },
|
fugitiveHash = { fg = C.br_blue },
|
||||||
fugitiveSymbolicRef = { link = 'gitcommitBranch' },
|
fugitiveSymbolicRef = { link = 'gitcommitBranch' },
|
||||||
fugitiveCount = { link = 'fugitiveUntrackedSection' },
|
fugitiveCount = { link = 'Normal' },
|
||||||
|
|
||||||
fugitiveHeading = { fg = C.yellow },
|
fugitiveHeading = { fg = C.br_yellow, italic = true, bold = true },
|
||||||
fugitiveUntrackedHeading = { link = 'gitcommitUntrackedFile' },
|
fugitiveUntrackedHeading = { fg = C.br_aqua, italic = true, bold = true },
|
||||||
fugitiveUnstagedHeading = { link = 'gitcommitDiscardedFile' },
|
fugitiveUnstagedHeading = { fg = C.br_orange, italic = true, bold = true },
|
||||||
fugitiveStagedHeading = { link = 'gitcommitSelectedFile' },
|
fugitiveStagedHeading = { fg = C.br_green, italic = true, bold = true },
|
||||||
|
|
||||||
|
fugitiveModifier = { fg = C.yellow },
|
||||||
|
fugitiveUntrackedModifier = { fg = C.aqua },
|
||||||
|
fugitiveUnstagedModifier = { fg = C.orange },
|
||||||
|
fugitiveStagedModifier = { fg = C.green },
|
||||||
|
|
||||||
fugitiveSection = { link = 'Normal' },
|
fugitiveSection = { link = 'Normal' },
|
||||||
fugitiveUntrackedSection = { fg = C.fg2 },
|
fugitiveUntrackedSection = { link = 'fugitiveSection' },
|
||||||
fugitiveUnstagedSection = { link = 'fugitiveUntrackedSection' },
|
fugitiveUnstagedSection = { link = 'fugitiveSection' },
|
||||||
fugitiveStagedSection = { link = 'fugitiveUntrackedSection' },
|
fugitiveStagedSection = { link = 'fugitiveSection' },
|
||||||
|
|
||||||
fugitiveModifier = { link = 'fugitiveHeading' },
|
|
||||||
fugitiveUntrackedModifier = { link = 'gitcommitUntrackedFile' },
|
|
||||||
fugitiveUnstagedModifier = { link = 'gitcommitDiscardedFile' },
|
|
||||||
fugitiveStagedModifier = { link = 'gitcommitSelectedFile' },
|
|
||||||
|
|
||||||
fugitiveHelpHeader = { link = 'fugitiveHeader' },
|
fugitiveHelpHeader = { link = 'fugitiveHeader' },
|
||||||
fugitiveHelpTag = { link = 'Tag' },
|
fugitiveHelpTag = { link = 'Tag' },
|
||||||
|
|
@ -426,6 +412,54 @@ M.highlights = function()
|
||||||
fugitiveStop = { link = 'Function' },
|
fugitiveStop = { link = 'Function' },
|
||||||
},
|
},
|
||||||
|
|
||||||
|
neogit = {
|
||||||
|
NeogitCommitMessage = { link = 'Comment' },
|
||||||
|
NeogitBranch = { fg = C.br_blue, bg = C.blue_bg, bold = true },
|
||||||
|
NeogitRemote = { fg = C.blue, bg = C.blue_bg, italic = true},
|
||||||
|
NeogitObjectId = { fg = C.br_blue },
|
||||||
|
NeogitStash = { link = 'NeogitObjectId' },
|
||||||
|
NeogitRebaseDone = { link = 'NeogitObjectId' },
|
||||||
|
|
||||||
|
NeogitUntrackedfiles = { fg = C.br_aqua, italic = true, bold = true },
|
||||||
|
NeogitUnstagedchanges = { fg = C.br_orange, italic = true, bold = true },
|
||||||
|
NeogitStagedchanges = { fg = C.br_green, italic = true, bold = true },
|
||||||
|
NeogitStashes = { fg = C.br_yellow, italic = true, bold = true },
|
||||||
|
NeogitUnmergedInto = { link = 'NeogitStashes' },
|
||||||
|
NeogitUnpushedTo = { link = 'NeogitStashes' },
|
||||||
|
NeogitUnpulledFrom = { link = 'NeogitStashes' },
|
||||||
|
NeogitRecentcommits = { link = 'NeogitStashes' },
|
||||||
|
NeogitRebasing = { link = 'NeogitStashes' },
|
||||||
|
|
||||||
|
NeogitHunkHeader = { fg = C.purple },
|
||||||
|
NeogitHunkHeaderHighlight = { fg = C.br_purple },
|
||||||
|
NeogitDiffContext = { fg = C.bg4 },
|
||||||
|
NeogitDiffContextHighlight = { bg = C.bg0 },
|
||||||
|
NeogitDiffAdd = { fg = C.green, bg = C.green_bg },
|
||||||
|
NeogitDiffAddHighlight = { fg = C.green, bg = C.green_bg },
|
||||||
|
NeogitDiffDelete = { fg = C.red, bg = C.red_bg },
|
||||||
|
NeogitDiffDeleteHighlight = { fg = C.red, bg = C.red_bg },
|
||||||
|
|
||||||
|
NeogitPopupSectionTitle = { fg = C.yellow },
|
||||||
|
NeogitPopupBranchName = { link = 'NeogitBranch' },
|
||||||
|
NeogitPopupBold = { bold = true },
|
||||||
|
NeogitPopupSwitchKey = { fg = C.blue },
|
||||||
|
NeogitPopupSwitchEnabled = { fg = C.br_red },
|
||||||
|
NeogitPopupSwitchDisabled = { link = 'Comment' },
|
||||||
|
NeogitPopupOptionKey = { link = 'NeogitPopupSwitchKey' },
|
||||||
|
NeogitPopupOptionEnabled = { link = 'NeogitPopupSwitchEnabled' },
|
||||||
|
NeogitPopupOptionDisabled = { link = 'NeogitPopupSwitchDisabled' },
|
||||||
|
NeogitPopupConfigKey = { link = 'NeogitPopupSwitchKey' },
|
||||||
|
NeogitPopupConfigEnabled = { link = 'NeogitPopupSwitchEnabled' },
|
||||||
|
NeogitPopupConfigDisabled = { link = 'NeogitPopupSwitchDisabled' },
|
||||||
|
NeogitPopupActionKey = { fg = C.aqua },
|
||||||
|
NeogitPopupActionDisabled = { link = 'Comment' },
|
||||||
|
|
||||||
|
NeogitCommitViewHeader = { fg = C.yellow },
|
||||||
|
NeogitFilePath = { fg = C.fg1, italic = true },
|
||||||
|
NeogitDiffHeader = { fg = C.blue, bg = C.blue_bg },
|
||||||
|
NeogitDiffHeaderHighlight = { fg = C.br_blue, bg = C.blue_bg },
|
||||||
|
},
|
||||||
|
|
||||||
-- 'ntpeters/vim-better-whitespace'
|
-- 'ntpeters/vim-better-whitespace'
|
||||||
better_whitespace = {
|
better_whitespace = {
|
||||||
ExtraWhitespace = { fg = C.orange, bg = C.orange }, -- trailing whitespace
|
ExtraWhitespace = { fg = C.orange, bg = C.orange }, -- trailing whitespace
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue