From 453cdcb0fecb342aabda0145fcaf011189d63a28 Mon Sep 17 00:00:00 2001 From: siduck Date: Thu, 2 Jun 2022 23:29:48 +0530 Subject: [PATCH] add some feline highlights --- lua/hl_themes/aquarium.lua | 1 - lua/hl_themes/blossom.lua | 1 - lua/hl_themes/catppuccin.lua | 5 +-- lua/hl_themes/chadracula.lua | 3 +- lua/hl_themes/chadtain.lua | 1 - lua/hl_themes/doomchad.lua | 3 +- lua/hl_themes/everforest.lua | 3 +- lua/hl_themes/everforest_light.lua | 1 - lua/hl_themes/gruvbox.lua | 1 - lua/hl_themes/gruvchad.lua | 5 +-- lua/hl_themes/jellybeans.lua | 3 +- lua/hl_themes/kanagawa.lua | 1 - lua/hl_themes/monekai.lua | 1 - lua/hl_themes/mountain.lua | 1 - lua/hl_themes/nightlamp.lua | 1 - lua/hl_themes/nightowl.lua | 1 - lua/hl_themes/nord.lua | 5 +-- lua/hl_themes/one_light.lua | 1 - lua/hl_themes/onedark.lua | 3 +- lua/hl_themes/onenord.lua | 1 - lua/hl_themes/palenight.lua | 1 - lua/hl_themes/pastelDark.lua | 1 - lua/hl_themes/radium.lua | 1 - lua/hl_themes/rxyhn.lua | 1 - lua/hl_themes/tokyodark.lua | 1 - lua/hl_themes/tokyonight.lua | 1 - lua/hl_themes/tomorrow_night.lua | 1 - lua/hl_themes/wombat.lua | 1 - lua/integrations/feline.lua | 68 +++++++++++++++--------------- 29 files changed, 45 insertions(+), 73 deletions(-) diff --git a/lua/hl_themes/aquarium.lua b/lua/hl_themes/aquarium.lua index d416778..8d4bce4 100644 --- a/lua/hl_themes/aquarium.lua +++ b/lua/hl_themes/aquarium.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#b8dceb", statusline_bg = "#262630", lightbg = "#2e2e38", - lightbg2 = "#2a2a34", pmenu_bg = "#ebb9b9", folder_bg = "#b8dceb", } diff --git a/lua/hl_themes/blossom.lua b/lua/hl_themes/blossom.lua index c9e865d..c1bd431 100644 --- a/lua/hl_themes/blossom.lua +++ b/lua/hl_themes/blossom.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#75998e", statusline_bg = "#dfd8d5", lightbg = "#cac3c0", - lightbg2 = "#dbd4d1", pmenu_bg = "#857e7b", folder_bg = "#746d6a", } diff --git a/lua/hl_themes/catppuccin.lua b/lua/hl_themes/catppuccin.lua index 93be227..5a3791a 100644 --- a/lua/hl_themes/catppuccin.lua +++ b/lua/hl_themes/catppuccin.lua @@ -22,14 +22,13 @@ M.base_30 = { blue = "#89B4FA", yellow = "#FAE3B0", sun = "#ffe9b6", - purple = "#DDB6F2", - dark_purple = "#d5aeea", + purple = "#d0a9e5", + dark_purple = "#c7a0dc", teal = "#B5E8E0", orange = "#F8BD96", cyan = "#89DCEB", statusline_bg = "#232232", lightbg = "#2f2e3e", - lightbg2 = "#282737", pmenu_bg = "#ABE9B3", folder_bg = "#89B4FA", lavender = "#c7d1ff", diff --git a/lua/hl_themes/chadracula.lua b/lua/hl_themes/chadracula.lua index 5bcba1b..28a68d4 100644 --- a/lua/hl_themes/chadracula.lua +++ b/lua/hl_themes/chadracula.lua @@ -18,7 +18,7 @@ M.base_30 = { line = "#3c3d49", -- for lines like vertsplit green = "#50fa7b", vibrant_green = "#5dff88", - nord_blue = "#b389ef", + nord_blue = "#8b9bcd", blue = "#a1b1e3", yellow = "#F1FA8C", sun = "#FFFFA5", @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#8BE9FD", statusline_bg = "#2d2f3b", lightbg = "#41434f", - lightbg2 = "#363844", pmenu_bg = "#b389ef", folder_bg = "#BD93F9", } diff --git a/lua/hl_themes/chadtain.lua b/lua/hl_themes/chadtain.lua index 656d5f3..183294d 100644 --- a/lua/hl_themes/chadtain.lua +++ b/lua/hl_themes/chadtain.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#9aafe6", statusline_bg = "#1e242a", lightbg = "#2d3339", - lightbg2 = "#252b31", pmenu_bg = "#8aac8b", folder_bg = "#6b8bab", } diff --git a/lua/hl_themes/doomchad.lua b/lua/hl_themes/doomchad.lua index c5ab233..b2b548b 100644 --- a/lua/hl_themes/doomchad.lua +++ b/lua/hl_themes/doomchad.lua @@ -22,14 +22,13 @@ M.base_30 = { blue = "#61afef", yellow = "#ECBE7B", sun = "#f2c481", - purple = "#afa7e7", + purple = "#dc8ef3", dark_purple = "#c678dd", teal = "#4db5bd", orange = "#ea9558", cyan = "#46D9FF", statusline_bg = "#2d3139", lightbg = "#3a3e46", - lightbg2 = "#32363e", pmenu_bg = "#98be65", folder_bg = "#51afef", } diff --git a/lua/hl_themes/everforest.lua b/lua/hl_themes/everforest.lua index d928542..93d538f 100644 --- a/lua/hl_themes/everforest.lua +++ b/lua/hl_themes/everforest.lua @@ -22,14 +22,13 @@ M.base_30 = { blue = "#7393b3", yellow = "#dbbc7f", sun = "#d1b171", - purple = "#b4bbc8", + purple = "#ecafcc", dark_purple = "#d699b6", teal = "#69a59d", orange = "#e69875", cyan = "#95d1c9", statusline_bg = "#2e363c", lightbg = "#3d454b", - lightbg2 = "#333b41", pmenu_bg = "#83c092", folder_bg = "#7393b3", } diff --git a/lua/hl_themes/everforest_light.lua b/lua/hl_themes/everforest_light.lua index 0cc9a3a..66e206f 100644 --- a/lua/hl_themes/everforest_light.lua +++ b/lua/hl_themes/everforest_light.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#7521e9", statusline_bg = "#f0ead9", lightbg = "#c9c3b2", - lightbg2 = "#dcd6c5", pmenu_bg = "#5f9b93", folder_bg = "#747b6e", } diff --git a/lua/hl_themes/gruvbox.lua b/lua/hl_themes/gruvbox.lua index 4871a3f..6e98cf9 100644 --- a/lua/hl_themes/gruvbox.lua +++ b/lua/hl_themes/gruvbox.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#82b3a8", statusline_bg = "#2c2c2c", lightbg = "#3d3d3d", - lightbg2 = "#323232", pmenu_bg = "#83a598", folder_bg = "#749689", } diff --git a/lua/hl_themes/gruvchad.lua b/lua/hl_themes/gruvchad.lua index 89a2830..3092f5f 100644 --- a/lua/hl_themes/gruvchad.lua +++ b/lua/hl_themes/gruvchad.lua @@ -22,14 +22,13 @@ M.base_30 = { blue = "#6d8dad", yellow = "#d6b676", sun = "#d1b171", - purple = "#b4bbc8", - dark_purple = "#cc7f94", + purple = "#9385b4", + dark_purple = "#887aa9", teal = "#749689", orange = "#e78a4e", cyan = "#82b3a8", statusline_bg = "#222526", lightbg = "#2d3031", - lightbg2 = "#252829", pmenu_bg = "#89b482", folder_bg = "#6d8dad", } diff --git a/lua/hl_themes/jellybeans.lua b/lua/hl_themes/jellybeans.lua index 4d52ac2..ecd6bb5 100644 --- a/lua/hl_themes/jellybeans.lua +++ b/lua/hl_themes/jellybeans.lua @@ -23,13 +23,12 @@ M.base_30 = { yellow = "#fad07a", sun = "#ffb964", purple = "#ea94ea", - dark_purple = "#e18be1", + dark_purple = "#e58fe5", teal = "#668799", orange = "#e78a4e", cyan = "#8fbfdc", statusline_bg = "#191919", lightbg = "#2c2c2c", - lightbg2 = "#1e1e1e", pmenu_bg = "#8197bf", folder_bg = "#8197bf", } diff --git a/lua/hl_themes/kanagawa.lua b/lua/hl_themes/kanagawa.lua index b331080..2da7d57 100644 --- a/lua/hl_themes/kanagawa.lua +++ b/lua/hl_themes/kanagawa.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#A3D4D5", statusline_bg = "#24242d", lightbg = "#33333c", - lightbg2 = "#292932", pmenu_bg = "#a48ec7", folder_bg = "#7E9CD8", } diff --git a/lua/hl_themes/monekai.lua b/lua/hl_themes/monekai.lua index 5dcaa05..edf69a4 100644 --- a/lua/hl_themes/monekai.lua +++ b/lua/hl_themes/monekai.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#41afef", statusline_bg = "#292c35", lightbg = "#3d4049", - lightbg2 = "#2e313a", pmenu_bg = "#99c366", folder_bg = "#61afef", } diff --git a/lua/hl_themes/mountain.lua b/lua/hl_themes/mountain.lua index 7a8aa8a..5bab581 100644 --- a/lua/hl_themes/mountain.lua +++ b/lua/hl_themes/mountain.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#9EC3C4", statusline_bg = "#131313", lightbg = "#292929", - lightbg2 = "#212121", pmenu_bg = "#8aac8b", folder_bg = "#8F8AAC", } diff --git a/lua/hl_themes/nightlamp.lua b/lua/hl_themes/nightlamp.lua index 3473133..57442a7 100644 --- a/lua/hl_themes/nightlamp.lua +++ b/lua/hl_themes/nightlamp.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#90a0a0", statusline_bg = "#1d1e24", lightbg = "#2b2c32", - lightbg2 = "#222329", pmenu_bg = "#b58385", folder_bg = "#90a0a0", } diff --git a/lua/hl_themes/nightowl.lua b/lua/hl_themes/nightowl.lua index 66e02e6..91a8127 100644 --- a/lua/hl_themes/nightowl.lua +++ b/lua/hl_themes/nightowl.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#aad2ff", statusline_bg = "#051a2b", lightbg = "#1a2f40", - lightbg2 = "#0e2334", pmenu_bg = "#82aaff", folder_bg = "#82aaff", } diff --git a/lua/hl_themes/nord.lua b/lua/hl_themes/nord.lua index b75cf39..2d9fbeb 100644 --- a/lua/hl_themes/nord.lua +++ b/lua/hl_themes/nord.lua @@ -22,14 +22,13 @@ M.base_30 = { nord_blue = "#81A1C1", yellow = "#EBCB8B", sun = "#e1c181", - purple = "#aab1be", - dark_purple = "#B48EAD", + purple = "#B48EAD", + dark_purple = "#a983a2", teal = "#6484a4", orange = "#e39a83", cyan = "#9aafe6", statusline_bg = "#333945", lightbg = "#3f4551", - lightbg2 = "#393f4b", pmenu_bg = "#A3BE8C", folder_bg = "#7797b7", } diff --git a/lua/hl_themes/one_light.lua b/lua/hl_themes/one_light.lua index 4827f0f..484e676 100644 --- a/lua/hl_themes/one_light.lua +++ b/lua/hl_themes/one_light.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#0b8ec6", statusline_bg = "#ececec", lightbg = "#d3d3d3", - lightbg2 = "#54555b", pmenu_bg = "#5e5f65", folder_bg = "#6C6C6C", } diff --git a/lua/hl_themes/onedark.lua b/lua/hl_themes/onedark.lua index b144859..a5196f5 100644 --- a/lua/hl_themes/onedark.lua +++ b/lua/hl_themes/onedark.lua @@ -22,14 +22,13 @@ M.base_30 = { blue = "#61afef", yellow = "#e7c787", sun = "#EBCB8B", - purple = "#b4bbc8", + purple = "#de98fd", dark_purple = "#c882e7", teal = "#519ABA", orange = "#fca2aa", cyan = "#a3b8ef", statusline_bg = "#22262e", lightbg = "#2d3139", - lightbg2 = "#262a32", pmenu_bg = "#98c379", folder_bg = "#61afef", } diff --git a/lua/hl_themes/onenord.lua b/lua/hl_themes/onenord.lua index f14e90a..bf6e1e4 100644 --- a/lua/hl_themes/onenord.lua +++ b/lua/hl_themes/onenord.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#9aafe6", statusline_bg = "#333945", lightbg = "#3f4551", - lightbg2 = "#393f4b", pmenu_bg = "#A3BE8C", folder_bg = "#7797b7", } diff --git a/lua/hl_themes/palenight.lua b/lua/hl_themes/palenight.lua index effc101..b781f9c 100644 --- a/lua/hl_themes/palenight.lua +++ b/lua/hl_themes/palenight.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#89ddff", -- base16 statusline_bg = "#2d3142", lightbg = "#3c4051", - lightbg2 = "#333748", pmenu_bg = "#82aaff", -- custom folder_bg = "#82aaff", } diff --git a/lua/hl_themes/pastelDark.lua b/lua/hl_themes/pastelDark.lua index 1085870..d7c46c8 100644 --- a/lua/hl_themes/pastelDark.lua +++ b/lua/hl_themes/pastelDark.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#b5c3ea", statusline_bg = "#181f26", lightbg = "#222930", - lightbg2 = "#1d242b", pmenu_bg = "#ef8891", folder_bg = "#99aee5", } diff --git a/lua/hl_themes/radium.lua b/lua/hl_themes/radium.lua index 18bb6e7..9ee4f40 100644 --- a/lua/hl_themes/radium.lua +++ b/lua/hl_themes/radium.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#50cad2", statusline_bg = "#15191e", lightbg = "#24282d", - lightbg2 = "#1d2126", pmenu_bg = "#3bdda2", folder_bg = "#5fb0fc", } diff --git a/lua/hl_themes/rxyhn.lua b/lua/hl_themes/rxyhn.lua index 0331b16..a282ab0 100644 --- a/lua/hl_themes/rxyhn.lua +++ b/lua/hl_themes/rxyhn.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#67AFC1", statusline_bg = "#0A1519", lightbg = "#1a2529", - lightbg2 = "#111C20", pmenu_bg = "#78B892", folder_bg = "#6791C9", } diff --git a/lua/hl_themes/tokyodark.lua b/lua/hl_themes/tokyodark.lua index d2c2147..36e3011 100644 --- a/lua/hl_themes/tokyodark.lua +++ b/lua/hl_themes/tokyodark.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#38a89d", statusline_bg = "#161722", lightbg = "#2a2b36", - lightbg2 = "#22232e", pmenu_bg = "#ee6d85", folder_bg = "#7199ee", } diff --git a/lua/hl_themes/tokyonight.lua b/lua/hl_themes/tokyonight.lua index 3c37490..71495bb 100644 --- a/lua/hl_themes/tokyonight.lua +++ b/lua/hl_themes/tokyonight.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#7dcfff", statusline_bg = "#1d1e29", lightbg = "#32333e", - lightbg2 = "#262732", pmenu_bg = "#7aa2f7", folder_bg = "#7aa2f7", } diff --git a/lua/hl_themes/tomorrow_night.lua b/lua/hl_themes/tomorrow_night.lua index 913c5e0..02f4adb 100644 --- a/lua/hl_themes/tomorrow_night.lua +++ b/lua/hl_themes/tomorrow_night.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#70c0b1", statusline_bg = "#212326", lightbg = "#373B41", - lightbg2 = "#2D3035", pmenu_bg = "#a4b595", folder_bg = "#6f8dab", } diff --git a/lua/hl_themes/wombat.lua b/lua/hl_themes/wombat.lua index fa18540..8b5b476 100644 --- a/lua/hl_themes/wombat.lua +++ b/lua/hl_themes/wombat.lua @@ -29,7 +29,6 @@ M.base_30 = { cyan = "#90fdf8", statusline_bg = "#262626", lightbg = "#3c3c3c", - lightbg2 = "#323232", pmenu_bg = "#95e454", folder_bg = "#7BB0C9", } diff --git a/lua/integrations/feline.lua b/lua/integrations/feline.lua index f13691f..da00669 100644 --- a/lua/integrations/feline.lua +++ b/lua/integrations/feline.lua @@ -14,26 +14,11 @@ return { FelineIconSeparator = { fg = colors.nord_blue, - bg = colors.lightbg, - }, - - FelineFileName = { - fg = colors.white, - bg = colors.lightbg, - }, - - FelineFileName_Separator = { - fg = colors.lightbg, - bg = colors.lightbg2, - }, - - FelineDirName = { - fg = colors.light_grey, - bg = colors.lightbg2, + bg = colors.grey, }, - FelineDirName_Separator = { - fg = colors.lightbg2, + FelineCwd = { + fg = colors.red, bg = colors.statusline_bg, }, @@ -65,7 +50,7 @@ return { }, Feline_LspIcon = { - fg = colors.nord_blue, + fg = colors.teal, bg = colors.statusline_bg, }, @@ -77,58 +62,73 @@ return { -- MODES Feline_NormalMode = { - fg = colors.red, - bg = colors.one_bg, + fg = colors.nord_blue, + bg = colors.lightbg, }, Feline_InsertMode = { fg = colors.dark_purple, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_TerminalMode = { fg = colors.green, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_VisualMode = { fg = colors.cyan, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_ReplaceMode = { fg = colors.orange, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_ConfirmMode = { fg = colors.teal, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_CommandMode = { fg = colors.pink, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_SelectMode = { fg = colors.nord_blue, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_EmptySpace = { - fg = colors.one_bg2, - bg = colors.one_bg, + fg = colors.grey, + bg = colors.lightbg, + }, + + Feline_file_info = { + bg = colors.nord_blue, + fg = colors.lightbg, }, - Feline_EmptySpace_git = { - fg = colors.one_bg, + Feline_file_info_sep = { + fg = colors.nord_blue, + bg = colors.grey, + }, + + Feline_nvim_gps = { + fg = colors.purple, bg = colors.statusline_bg, }, + Feline_time = { + fg = colors.red, + bg = colors.lightbg, + }, + Feline_CurrentLine = { fg = colors.green, - bg = colors.one_bg, + bg = colors.lightbg, }, Feline_PositionIcon = { @@ -138,6 +138,6 @@ return { Feline_PositionSeparator = { fg = colors.green, - bg = colors.one_bg2, + bg = colors.grey, }, }