fixes
This commit is contained in:
@@ -0,0 +1 @@
|
|||||||
|
cspell.json
|
||||||
@@ -7,5 +7,5 @@ fallback. With `termguicolors` disabled, Neovim uses the `cterm` colors, so the
|
|||||||
theme remains usable in a Linux console or another TTY without true color or
|
theme remains usable in a Linux console or another TTY without true color or
|
||||||
256-color support.
|
256-color support.
|
||||||
|
|
||||||
See: http://git.io/lush.nvim for more information on Lush and a helper script
|
See: https://git.io/lush.nvim for more information on Lush and a helper script
|
||||||
to setup your repo clone.
|
to set up your repo clone.
|
||||||
|
|||||||
-16
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
|
|
||||||
"version": "0.2",
|
|
||||||
"dictionaries": ["workspace-words", "user-words"],
|
|
||||||
"dictionaryDefinitions": [{
|
|
||||||
"name": "workspace-words",
|
|
||||||
"path": "./.cspell/words.txt",
|
|
||||||
"addWords": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "user-words",
|
|
||||||
"path": "/home/sgraves/.desktop/.cspell/user_words.txt",
|
|
||||||
"addWords": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -145,61 +145,26 @@ local create_lualine_theme = function()
|
|||||||
foreground_3 = 8
|
foreground_3 = 8
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local create_mode = function(background)
|
||||||
return {
|
return {
|
||||||
normal = {
|
|
||||||
a = {
|
a = {
|
||||||
bg = theme_colors.background_n,
|
bg = background,
|
||||||
fg = theme_colors.foreground,
|
|
||||||
gui = "bold"
|
|
||||||
},
|
|
||||||
b = {bg = theme_colors.background_b, fg = theme_colors.foreground_2},
|
|
||||||
c = {bg = theme_colors.background_c, fg = theme_colors.foreground_3}
|
|
||||||
},
|
|
||||||
insert = {
|
|
||||||
a = {
|
|
||||||
bg = theme_colors.background_i,
|
|
||||||
fg = theme_colors.foreground,
|
|
||||||
gui = "bold"
|
|
||||||
},
|
|
||||||
b = {bg = theme_colors.background_b, fg = theme_colors.foreground_2},
|
|
||||||
c = {bg = theme_colors.background_c, fg = theme_colors.foreground_3}
|
|
||||||
},
|
|
||||||
visual = {
|
|
||||||
a = {
|
|
||||||
bg = theme_colors.background_v,
|
|
||||||
fg = theme_colors.foreground,
|
|
||||||
gui = "bold"
|
|
||||||
},
|
|
||||||
b = {bg = theme_colors.background_b, fg = theme_colors.foreground_2},
|
|
||||||
c = {bg = theme_colors.background_c, fg = theme_colors.foreground_3}
|
|
||||||
},
|
|
||||||
replace = {
|
|
||||||
a = {
|
|
||||||
bg = theme_colors.background_r,
|
|
||||||
fg = theme_colors.foreground,
|
|
||||||
gui = "bold"
|
|
||||||
},
|
|
||||||
b = {bg = theme_colors.background_b, fg = theme_colors.foreground_2},
|
|
||||||
c = {bg = theme_colors.background_c, fg = theme_colors.foreground_3}
|
|
||||||
},
|
|
||||||
command = {
|
|
||||||
a = {
|
|
||||||
bg = theme_colors.background_cm,
|
|
||||||
fg = theme_colors.foreground,
|
|
||||||
gui = "bold"
|
|
||||||
},
|
|
||||||
b = {bg = theme_colors.background_b, fg = theme_colors.foreground_2},
|
|
||||||
c = {bg = theme_colors.background_c, fg = theme_colors.foreground_3}
|
|
||||||
},
|
|
||||||
inactive = {
|
|
||||||
a = {
|
|
||||||
bg = theme_colors.background_n,
|
|
||||||
fg = theme_colors.foreground,
|
fg = theme_colors.foreground,
|
||||||
gui = "bold"
|
gui = "bold"
|
||||||
},
|
},
|
||||||
b = {bg = theme_colors.background_b, fg = theme_colors.foreground_2},
|
b = {bg = theme_colors.background_b, fg = theme_colors.foreground_2},
|
||||||
c = {bg = theme_colors.background_c, fg = theme_colors.foreground_3}
|
c = {bg = theme_colors.background_c, fg = theme_colors.foreground_3}
|
||||||
}
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
return {
|
||||||
|
normal = create_mode(theme_colors.background_n),
|
||||||
|
insert = create_mode(theme_colors.background_i),
|
||||||
|
visual = create_mode(theme_colors.background_v),
|
||||||
|
replace = create_mode(theme_colors.background_r),
|
||||||
|
command = create_mode(theme_colors.background_cm),
|
||||||
|
inactive = create_mode(theme_colors.background_n)
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -227,8 +192,7 @@ local theme =
|
|||||||
function(injected_functions)
|
function(injected_functions)
|
||||||
local sym = injected_functions.sym
|
local sym = injected_functions.sym
|
||||||
return {
|
return {
|
||||||
-- Diagnostics general
|
-- diagnostics
|
||||||
--
|
|
||||||
CodeError {gui = "reverse"},
|
CodeError {gui = "reverse"},
|
||||||
CodeHint {gui = "reverse"},
|
CodeHint {gui = "reverse"},
|
||||||
CodeInfo {gui = "reverse"},
|
CodeInfo {gui = "reverse"},
|
||||||
@@ -237,7 +201,11 @@ local theme =
|
|||||||
HintSign {bg = colors.GutterBackground, fg = colors.SecondaryForeground},
|
HintSign {bg = colors.GutterBackground, fg = colors.SecondaryForeground},
|
||||||
InfoSign {bg = colors.GutterBackground, fg = colors.EmphasisForeground},
|
InfoSign {bg = colors.GutterBackground, fg = colors.EmphasisForeground},
|
||||||
WarningSign {bg = colors.GutterBackground, fg = colors.WarningForeground},
|
WarningSign {bg = colors.GutterBackground, fg = colors.WarningForeground},
|
||||||
|
--
|
||||||
|
-- indent-blankline.nvim
|
||||||
IblScope {fg = colors.SecondaryForeground, bg = colors.None},
|
IblScope {fg = colors.SecondaryForeground, bg = colors.None},
|
||||||
|
--
|
||||||
|
-- references
|
||||||
IdentifierUnderCaret {
|
IdentifierUnderCaret {
|
||||||
gui = "underline,bold,italic"
|
gui = "underline,bold,italic"
|
||||||
},
|
},
|
||||||
@@ -245,12 +213,11 @@ local theme =
|
|||||||
gui = "underline,bold,italic"
|
gui = "underline,bold,italic"
|
||||||
},
|
},
|
||||||
--
|
--
|
||||||
--
|
|
||||||
-- c/cpp
|
-- c/cpp
|
||||||
cFunction {fg = colors.FunctionForeground},
|
cFunction {fg = colors.FunctionForeground},
|
||||||
cppDestructor {fg = colors.FunctionForeground},
|
cppDestructor {fg = colors.FunctionForeground},
|
||||||
--
|
--
|
||||||
-- CoC
|
-- coc.nvim
|
||||||
CocErrorHighlight {fg = colors.ErrorForeground, gui = "bold,underline"},
|
CocErrorHighlight {fg = colors.ErrorForeground, gui = "bold,underline"},
|
||||||
CocHintHighlight {fg = colors.SecondaryForeground, gui = "bold,underline"},
|
CocHintHighlight {fg = colors.SecondaryForeground, gui = "bold,underline"},
|
||||||
CocInfoHighlight {fg = colors.EmphasisForeground, gui = "bold,underline"},
|
CocInfoHighlight {fg = colors.EmphasisForeground, gui = "bold,underline"},
|
||||||
@@ -291,7 +258,8 @@ local theme =
|
|||||||
CocSymbolMethod {fg = colors.FunctionForeground},
|
CocSymbolMethod {fg = colors.FunctionForeground},
|
||||||
CocUnderline {fg = colors.AccentForeground, gui = "bold,underline"},
|
CocUnderline {fg = colors.AccentForeground, gui = "bold,underline"},
|
||||||
CocWarningFloat {fg = colors.EmphasisForeground, bg = colors.RaisedBackground},
|
CocWarningFloat {fg = colors.EmphasisForeground, bg = colors.RaisedBackground},
|
||||||
-- easymotion
|
--
|
||||||
|
-- vim-easymotion
|
||||||
EasyMotionShade {fg = colors.CommentForeground},
|
EasyMotionShade {fg = colors.CommentForeground},
|
||||||
EasyMotionIncSearch {
|
EasyMotionIncSearch {
|
||||||
fg = colors.AccentForeground,
|
fg = colors.AccentForeground,
|
||||||
@@ -299,12 +267,12 @@ local theme =
|
|||||||
},
|
},
|
||||||
EasyMotionTarget {gui = "underline", fg = colors.WarningForeground},
|
EasyMotionTarget {gui = "underline", fg = colors.WarningForeground},
|
||||||
--
|
--
|
||||||
-- fidget
|
-- fidget.nvim
|
||||||
FidgetDone {fg = colors.PositiveForeground},
|
FidgetDone {fg = colors.PositiveForeground},
|
||||||
FidgetGroup {fg = colors.FaintForeground},
|
FidgetGroup {fg = colors.FaintForeground},
|
||||||
FidgetProgress {fg = colors.AccentForeground},
|
FidgetProgress {fg = colors.AccentForeground},
|
||||||
--
|
--
|
||||||
-- gitsigns
|
-- gitsigns.nvim
|
||||||
GitSignsCurrentLineBlame {fg = colors.CommentForeground, bg = colors.None},
|
GitSignsCurrentLineBlame {fg = colors.CommentForeground, bg = colors.None},
|
||||||
--
|
--
|
||||||
-- lua
|
-- lua
|
||||||
@@ -322,7 +290,7 @@ local theme =
|
|||||||
CmpItemKindDefault {fg = colors.SyntaxForeground},
|
CmpItemKindDefault {fg = colors.SyntaxForeground},
|
||||||
CmpItemMenu {fg = colors.EmphasisForeground},
|
CmpItemMenu {fg = colors.EmphasisForeground},
|
||||||
--
|
--
|
||||||
-- nvim notify
|
-- nvim-notify
|
||||||
NotifyBackground {
|
NotifyBackground {
|
||||||
bg = colors.RaisedBackground,
|
bg = colors.RaisedBackground,
|
||||||
fg = colors.RaisedBackground
|
fg = colors.RaisedBackground
|
||||||
@@ -400,7 +368,7 @@ local theme =
|
|||||||
fg = colors.ConstantForeground
|
fg = colors.ConstantForeground
|
||||||
},
|
},
|
||||||
--
|
--
|
||||||
-- nvim tree
|
-- nvim-tree
|
||||||
NvimTreeEndOfBuffer {bg = colors.Background},
|
NvimTreeEndOfBuffer {bg = colors.Background},
|
||||||
NvimTreeFolderIcon {fg = colors.DirectoryIconForeground},
|
NvimTreeFolderIcon {fg = colors.DirectoryIconForeground},
|
||||||
NvimTreeFolderName {fg = colors.SecondaryForeground, gui = "bold"},
|
NvimTreeFolderName {fg = colors.SecondaryForeground, gui = "bold"},
|
||||||
@@ -417,19 +385,19 @@ local theme =
|
|||||||
NvimTreeSymlink {fg = colors.AccentForeground, gui = "italic"},
|
NvimTreeSymlink {fg = colors.AccentForeground, gui = "italic"},
|
||||||
NvimTreeExecFile {fg = colors.PositiveForeground, gui = "italic"},
|
NvimTreeExecFile {fg = colors.PositiveForeground, gui = "italic"},
|
||||||
--
|
--
|
||||||
-- nvim scrollview
|
-- nvim-scrollview
|
||||||
ScrollView {
|
ScrollView {
|
||||||
fg = colors.None,
|
fg = colors.None,
|
||||||
bg = colors.ScrollbarThumbBackground
|
bg = colors.ScrollbarThumbBackground
|
||||||
},
|
},
|
||||||
--
|
--
|
||||||
-- Telescope
|
-- telescope.nvim
|
||||||
TelescopeBorder {bg = colors.TabBackground},
|
TelescopeBorder {bg = colors.TabBackground},
|
||||||
TelescopeMatching {fg = colors.AccentForeground},
|
TelescopeMatching {fg = colors.AccentForeground},
|
||||||
TelescopeNormal {bg = colors.Background},
|
TelescopeNormal {bg = colors.Background},
|
||||||
TelescopePromptNormal {bg = colors.Background},
|
TelescopePromptNormal {bg = colors.Background},
|
||||||
--
|
--
|
||||||
-- window-picker
|
-- window-picker.nvim
|
||||||
WindowPicker {
|
WindowPicker {
|
||||||
fg = colors.EmphasisForeground,
|
fg = colors.EmphasisForeground,
|
||||||
bg = colors.ModeNormalBackground,
|
bg = colors.ModeNormalBackground,
|
||||||
@@ -446,7 +414,7 @@ local theme =
|
|||||||
gui = "bold"
|
gui = "bold"
|
||||||
},
|
},
|
||||||
--
|
--
|
||||||
-- Neovim
|
-- neovim
|
||||||
Added {fg = colors.PositiveForeground},
|
Added {fg = colors.PositiveForeground},
|
||||||
Changed {gui = "italic,underline"},
|
Changed {gui = "italic,underline"},
|
||||||
Character {fg = colors.PositiveForeground},
|
Character {fg = colors.PositiveForeground},
|
||||||
@@ -547,15 +515,15 @@ local theme =
|
|||||||
LineNrSpecial {bg = colors.GutterBackground, fg = colors.SyntaxForeground},
|
LineNrSpecial {bg = colors.GutterBackground, fg = colors.SyntaxForeground},
|
||||||
LspReferenceRead {
|
LspReferenceRead {
|
||||||
gui = "underline,italic",
|
gui = "underline,italic",
|
||||||
guibg = colors.None
|
bg = colors.None
|
||||||
},
|
},
|
||||||
LspReferenceText {
|
LspReferenceText {
|
||||||
gui = "underline,italic",
|
gui = "underline,italic",
|
||||||
guibg = colors.None
|
bg = colors.None
|
||||||
},
|
},
|
||||||
LspReferenceWrite {
|
LspReferenceWrite {
|
||||||
gui = "underline,bold,italic",
|
gui = "underline,bold,italic",
|
||||||
guibg = colors.None
|
bg = colors.None
|
||||||
},
|
},
|
||||||
LspCodeLens {fg = colors.DimForeground},
|
LspCodeLens {fg = colors.DimForeground},
|
||||||
LspCodeLensSeparator {fg = colors.DimForeground},
|
LspCodeLensSeparator {fg = colors.DimForeground},
|
||||||
@@ -618,7 +586,7 @@ local theme =
|
|||||||
WarningMsg {fg = colors.WarningForeground},
|
WarningMsg {fg = colors.WarningForeground},
|
||||||
WinSeparator {bg = colors.GutterBackground},
|
WinSeparator {bg = colors.GutterBackground},
|
||||||
--
|
--
|
||||||
-- mason
|
-- mason.nvim
|
||||||
MasonBackdrop {bg = colors.Background},
|
MasonBackdrop {bg = colors.Background},
|
||||||
MasonNormal {NormalFloat},
|
MasonNormal {NormalFloat},
|
||||||
MasonHeader {
|
MasonHeader {
|
||||||
|
|||||||
@@ -43,31 +43,26 @@ local color_overrides = {
|
|||||||
["#434360"] = 8,
|
["#434360"] = 8,
|
||||||
["#445397"] = 4,
|
["#445397"] = 4,
|
||||||
["#474344"] = 8,
|
["#474344"] = 8,
|
||||||
|
["#4a2020"] = 1,
|
||||||
|
["#4d3d22"] = 3,
|
||||||
["#4d4d6f"] = 8,
|
["#4d4d6f"] = 8,
|
||||||
["#506d50"] = 2,
|
["#506d50"] = 2,
|
||||||
["#5c5758"] = 8,
|
["#5c5758"] = 8,
|
||||||
["#4a2020"] = 1,
|
|
||||||
["#4d3d22"] = 3,
|
|
||||||
["#5f595a"] = 8,
|
["#5f595a"] = 8,
|
||||||
["#727faf"] = 12,
|
|
||||||
["#6a906a"] = 10,
|
["#6a906a"] = 10,
|
||||||
|
["#727faf"] = 12,
|
||||||
["#766f71"] = 8,
|
["#766f71"] = 8,
|
||||||
["#952d2d"] = 1,
|
|
||||||
["#958e8f"] = 7,
|
|
||||||
["#927b9e"] = 13,
|
["#927b9e"] = 13,
|
||||||
|
["#952d2d"] = 1,
|
||||||
["#9a8065"] = 11,
|
["#9a8065"] = 11,
|
||||||
["#9c9697"] = 7,
|
["#9c9697"] = 7,
|
||||||
["#a19b9c"] = 7,
|
|
||||||
["#ababab"] = 7,
|
|
||||||
["#b0abac"] = 7,
|
["#b0abac"] = 7,
|
||||||
["#b5a15a"] = 11,
|
|
||||||
["#b47a41"] = 11,
|
["#b47a41"] = 11,
|
||||||
["#bab5b6"] = 15,
|
["#b5a15a"] = 11,
|
||||||
["#bfbbbc"] = 15,
|
["#bfbbbc"] = 15,
|
||||||
["#c18a53"] = 11,
|
["#c18a53"] = 11,
|
||||||
["#c4c0c1"] = 15,
|
|
||||||
["#cc9e71"] = 11,
|
|
||||||
["#c96b68"] = 9,
|
["#c96b68"] = 9,
|
||||||
|
["#cc9e71"] = 11,
|
||||||
["#ffffff"] = 15
|
["#ffffff"] = 15
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user