diff options
| author | Nicholas Noll <nnoll523@gmail.com> | 2021-10-09 12:22:00 -0700 |
|---|---|---|
| committer | Nicholas Noll <nnoll523@gmail.com> | 2021-10-09 12:22:00 -0700 |
| commit | 78b5250bd17e6e5566ec56704035391afd16ac83 (patch) | |
| tree | 1496537515c673b82a1f851d1c08a75811bd302f | |
| parent | 73d9e7ec94af4e899af9e96583d69f4ba54d2b56 (diff) | |
fix: conflict
| -rw-r--r-- | .config/nvim/lua/theme.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua index 0072074..7bccfc0 100644 --- a/.config/nvim/lua/theme.lua +++ b/.config/nvim/lua/theme.lua @@ -40,7 +40,7 @@ local color = { }, yellow = { [1] = "#fabd2f", - [2] = "#eecf9", + [2] = "#eecf90", }, red = { [1] = "#d75f5f", @@ -93,8 +93,8 @@ local theme = { Statement = { ctermfg="243", guifg=color.aqua[2] }, Operator = { ctermfg="251", guifg=color.white[3] }, PreProc = { ctermfg="243", guifg=color.red[2] }, - Type = { ctermfg="251", guifg=color.yellow[2], gui="bold" }, - Special = { ctermfg="243", guifg=color.gray[1] }, + Type = { ctermfg="251", guifg=color.yellow[2] }, + Special = { ctermfg="243", guifg=color.purple[1] }, Error = { ctermfg="132", guifg=color.orange[1] }, Warning = { ctermfg="179", guifg=color.yellow[1] }, ModeMsg = { ctermfg="243", guifg=color.gray[2] }, @@ -130,7 +130,8 @@ local theme = { QuickFixLine = { ctermbg="234", guibg=color.black[1] }, DiffAdd = { ctermbg="236", ctermfg="108", guifg=color.aqua[1] }, DiffChange = { ctermbg="236", guifg=color.yellow[1] }, - DiffDelete = { ctermbg="236", ctermfg="132", guifg=color.purple[1] }, + DiffName = { ctermbg="236", ctermfg="132", guifg=color.purple[1] }, + DiffDelete = { ctermbg="236", ctermfg="132", guifg=color.red[1] }, DiffText = { ctermbg="236", ctermfg="179", guifg=color.yellow[1] }, helpHyperTextJump = { ctermfg="140", guifg=color.blue[1] }, netrwExe = { guifg=color.aqua[1] }, @@ -141,6 +142,7 @@ local links = { CursorLine = { "CursorColumn" }, DiffAdd = { "diffAdded", "GitSignsAdd" }, DiffChange = { "GitSignsChange" }, + DiffName = { "diffSubname" }, DiffDelete = { "diffRemoved", "GitSignsDelete" }, Error = { "ErrorMsg" }, htmlTag = { "htmlEndTag" }, |