From f51a6f4e19e6d9290c216f2b86f0d815d46ec273 Mon Sep 17 00:00:00 2001 From: Slotos Date: Thu, 30 Dec 2021 11:49:41 +0200 Subject: [PATCH] Second iteration of light palette This commit tackles: - Lualine colors. Lualine had been made less contrasting in order to fit both light and dark backgrounds. Specifically, use of colors above nord7 was restricted to cases where text is not as important as the visual indication of the mode we're in. - TabLine colors TabLine colors are now in agreement with lualine colors and should look fitting out of the box - Visual selection Visual selection is now a shade more intence than cursor line, making it noticable both in dark and light mode. - Lualine inactive colors A typo that snuck in some time ago was fixed too, lualine inactive colors are back. --- lua/lualine/themes/nord.lua | 30 +++++++++++++++--------------- lua/nord/colors.lua | 4 ++-- lua/nord/theme.lua | 8 ++++---- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lua/lualine/themes/nord.lua b/lua/lualine/themes/nord.lua index 88400d8..234cc42 100644 --- a/lua/lualine/themes/nord.lua +++ b/lua/lualine/themes/nord.lua @@ -3,35 +3,35 @@ local colors = require('nord.colors') local nord = {} nord.normal = { - a = {fg = colors.nord0_gui, bg = colors.nord4_gui, gui = 'bold'}, - b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, - c = {fg = colors.nord4_gui, bg = colors.nord1_gui}, + a = {fg = colors.nord1_gui, bg = colors.nord9_gui}, + b = {fg = colors.nord5_gui, bg = colors.nord2_gui}, + c = {fg = colors.nord4_gui, bg = colors.nord1_gui}, } nord.insert = { - a = {fg = colors.nord0_gui, bg = colors.nord14_gui, gui = 'bold'}, - b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, + a = {fg = colors.nord1_gui, bg = colors.nord4_gui}, + b = {fg = colors.nord6_gui, bg = colors.nord3_gui_bright}, } nord.visual = { - a = {fg = colors.nord0_gui, bg = colors.nord9_gui, gui = 'bold'}, - b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, + a = {fg = colors.nord0_gui, bg = colors.nord9_gui}, + b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, } nord.replace = { - a = {fg = colors.nord0_gui, bg = colors.nord11_gui, gui = 'bold'}, - b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, + a = {fg = colors.nord0_gui, bg = colors.nord11_gui}, + b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, } nord.command = { - a = {fg = colors.nord0_gui, bg = colors.nord15_gui, gui = 'bold'}, - b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, + a = {fg = colors.nord0_gui, bg = colors.nord15_gui, gui = 'bold'}, + b = {fg = colors.nord4_gui, bg = colors.nord10_gui}, } -nord.innord10_gui = { - a = {fg = colors.nord1_gui, bg = colors.nord0_gui, gui = 'bold'}, - b = {fg = colors.nord1_gui, bg = colors.nord0_gui}, - c = {fg = colors.nord1_gui, bg = colors.nord1_gui} +nord.inactive = { + a = {fg = colors.nord4_gui, bg = colors.nord0_gui, gui = 'bold'}, + b = {fg = colors.nord4_gui, bg = colors.nord0_gui}, + c = {fg = colors.nord4_gui, bg = colors.nord1_gui} } return nord diff --git a/lua/nord/colors.lua b/lua/nord/colors.lua index 4a9cb11..eadbed1 100644 --- a/lua/nord/colors.lua +++ b/lua/nord/colors.lua @@ -23,8 +23,8 @@ local nord = (vim.o.background == 'dark') and { nord0_gui = "#ECEFF4", -- nord6 in palette nord1_gui = "#E5E9F0", -- nord5 in palette nord2_gui = "#D8DEE9", -- nord4 in palette - nord3_gui = "#4C566A", -- out of palette - nord3_gui_bright = "#AEC7DF", -- nord3 in palette + nord3_gui = "#4C566A", -- nord3 in palette + nord3_gui_bright = "#AEC7DF", -- out of palette nord4_gui = "#434C5E", -- nord2 in palette nord5_gui = "#3B4252", -- nord1 in palette nord6_gui = "#2E3440", -- nord0 in palette diff --git a/lua/nord/theme.lua b/lua/nord/theme.lua index 487feaf..4ba94cb 100644 --- a/lua/nord/theme.lua +++ b/lua/nord/theme.lua @@ -118,11 +118,11 @@ theme.loadEditor = function () StatusLineTerm = { fg = nord.nord4_gui, bg = nord.nord2_gui }, StatusLineTermNC = { fg = nord.nord4_gui, bg = nord.nord1_gui }, TabLineFill = { fg = nord.nord4_gui, bg = nord.none }, - TablineSel = { fg = nord.nord8_gui, bg = nord.nord3_gui }, - Tabline = { fg = nord.nord4_gui, bg = nord.nord0_gui }, + TablineSel = { fg = nord.nord1_gui, bg = nord.nord9_gui }, + Tabline = { fg = nord.nord4_gui, bg = nord.nord1_gui }, Title = { fg = nord.nord14_gui, bg = nord.none, style = 'bold' }, - Visual = { fg = nord.none, bg = nord.nord1_gui }, - VisualNOS = { fg = nord.none, bg = nord.nord1_gui }, + Visual = { fg = nord.none, bg = nord.nord2_gui }, + VisualNOS = { fg = nord.none, bg = nord.nord2_gui }, WarningMsg = { fg = nord.nord15_gui }, WildMenu = { fg = nord.nord12_gui, bg = nord.none, style = 'bold' }, CursorColumn = { fg = nord.none, bg = nord.cursorlinefg }, -- 2.39.5