Extract named colors into separate file

diff --git a/lua/nord/colors.lua b/lua/nord/colors.lua
index 604612abe35e7e790e5e102d1d52ee335895683d..a13d8351cbe0a24ecf79ec6e038db7c888927b63 100644 (file)
--- a/lua/nord/colors.lua
+++ b/lua/nord/colors.lua
@@ -1,46 +1,50 @@
-local nord = (vim.o.background == "dark")
-               and {
-                       --16 colors
-                       nord0_gui = "#2E3440", -- nord0 in palette
-                       nord1_gui = "#3B4252", -- nord1 in palette
-                       nord2_gui = "#434C5E", -- nord2 in palette
-                       nord3_gui = "#4C566A", -- nord3 in palette
-                       nord3_gui_bright = "#616E88", -- out of palette
-                       nord4_gui = "#D8DEE9", -- nord4 in palette
-                       nord5_gui = "#E5E9F0", -- nord5 in palette
-                       nord6_gui = "#ECEFF4", -- nord6 in palette
-                       nord7_gui = "#8FBCBB", -- nord7 in palette
-                       nord8_gui = "#88C0D0", -- nord8 in palette
-                       nord9_gui = "#81A1C1", -- nord9 in palette
-                       nord10_gui = "#5E81AC", -- nord10 in palette
-                       nord11_gui = "#BF616A", -- nord11 in palette
-                       nord12_gui = "#D08770", -- nord12 in palette
-                       nord13_gui = "#EBCB8B", -- nord13 in palette
-                       nord14_gui = "#A3BE8C", -- nord14 in palette
-                       nord15_gui = "#B48EAD", -- nord15 in palette
-                       none = "NONE",
-               }
-       or {
-               --16 colors
-               nord0_gui = "#ECEFF4", -- nord6 in palette
-               nord1_gui = "#E5E9F0", -- nord5 in palette
-               nord2_gui = "#D8DEE9", -- nord4 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
-               nord7_gui = "#8FBCBB", -- nord7 in palette
-               nord8_gui = "#88C0D0", -- nord8 in palette
-               nord9_gui = "#81A1C1", -- nord9 in palette
-               nord10_gui = "#5E81AC", -- nord10 in palette
-               nord11_gui = "#BF616A", -- nord11 in palette
-               nord12_gui = "#D08770", -- nord12 in palette
-               nord13_gui = "#EBCB8B", -- nord13 in palette
-               nord14_gui = "#A3BE8C", -- nord14 in palette
-               nord15_gui = "#B48EAD", -- nord15 in palette
-               none = "NONE",
-       }
+local named_colors = require("nord.named_colors")
+
+local dark_colors = {
+       nord0_gui = named_colors.black, -- nord0 in palette
+       nord1_gui = named_colors.dark_gray, -- nord1 in palette
+       nord2_gui = named_colors.gray, -- nord2 in palette
+       nord3_gui =named_colors.light_gray, -- nord3 in palette
+       nord3_gui_bright =named_colors.light_gray_bright, -- out of palette
+       nord4_gui = named_colors.darkest_white, -- nord4 in palette
+       nord5_gui = named_colors.darker_white, -- nord5 in palette
+       nord6_gui = named_colors.white, -- nord6 in palette
+       nord7_gui = named_colors.teal, -- nord7 in palette
+       nord8_gui = named_colors.off_blue, -- nord8 in palette
+       nord9_gui = named_colors.glacier, -- nord9 in palette
+       nord10_gui = named_colors.blue, -- nord10 in palette
+       nord11_gui = named_colors.red, -- nord11 in palette
+       nord12_gui = named_colors.orange, -- nord12 in palette
+       nord13_gui = named_colors.yellow, -- nord13 in palette
+       nord14_gui = named_colors.green, -- nord14 in palette
+       nord15_gui = named_colors.purple, -- nord15 in palette
+       none = "NONE",
+}
+
+local light_colors =  {
+       nord0_gui = named_colors.white, -- nord0 in palette
+       nord1_gui = named_colors.darker_white, -- nord1 in palette
+       nord2_gui = named_colors.darkest_white, -- nord2 in palette
+       nord3_gui =named_colors.light_gray, -- nord3 in palette
+       nord3_gui_bright =named_colors.light_gray_bright, -- out of palette
+       nord4_gui = named_colors.gray, -- nord4 in palette
+       nord5_gui = named_colors.dark_gray, -- nord5 in palette
+       nord6_gui = named_colors.black, -- nord6 in palette
+
+       -- Same colors across light and dark from here down...
+       nord7_gui = named_colors.teal, -- nord7 in palette
+       nord8_gui = named_colors.off_blue, -- nord8 in palette
+       nord9_gui = named_colors.glacier, -- nord9 in palette
+       nord10_gui = named_colors.blue, -- nord10 in palette
+       nord11_gui = named_colors.red, -- nord11 in palette
+       nord12_gui = named_colors.orange, -- nord12 in palette
+       nord13_gui = named_colors.yellow, -- nord13 in palette
+       nord14_gui = named_colors.green, -- nord14 in palette
+       nord15_gui = named_colors.purple, -- nord15 in palette
+       none = "NONE",
+}
+
+local nord = (vim.o.background == "dark") and dark_colors or light_colors
 
 -- Enable contrast sidebars, floating windows and popup menus
 if vim.g.nord_contrast then

diff --git a/lua/nord/named_colors.lua b/lua/nord/named_colors.lua
new file mode 100644 (file)
index 0000000..cb6eed3
--- /dev/null
+++ b/lua/nord/named_colors.lua
@@ -0,0 +1,22 @@
+local nord = {
+                       --16 colors
+                       black = "#2E3440", -- nord0 in palette
+                       dark_gray = "#3B4252", -- nord1 in palette
+                       gray = "#434C5E", -- nord2 in palette
+                       light_gray = "#4C566A", -- nord3 in palette
+                       light_gray_bright = "#616E88", -- out of palette
+                       darkest_white = "#D8DEE9", -- nord4 in palette
+                       darker_white = "#E5E9F0", -- nord5 in palette
+                       white = "#ECEFF4", -- nord6 in palette
+                       teal = "#8FBCBB", -- nord7 in palette
+                       off_blue = "#88C0D0", -- nord8 in palette
+                       glacier = "#81A1C1", -- nord9 in palette
+                       blue = "#5E81AC", -- nord10 in palette
+                       red = "#BF616A", -- nord11 in palette
+                       orange = "#D08770", -- nord12 in palette
+                       yellow = "#EBCB8B", -- nord13 in palette
+                       green = "#A3BE8C", -- nord14 in palette
+                       purple = "#B48EAD", -- nord15 in palette
+                       none = "NONE",
+               }
+return nord