From 089a8884a1f0e9f9fe8a93d394238cce17969825 Mon Sep 17 00:00:00 2001 From: David Thievon Date: Sat, 18 Jan 2025 13:22:17 +0100 Subject: [PATCH] feat(platforms): move all platform files to generation system --- lua/nordic/platforms/fish_themes.lua | 43 ++ lua/nordic/platforms/foot.lua | 36 +- lua/nordic/platforms/iTerm2.lua | 383 ++++++++++++++++++ lua/nordic/platforms/init.lua | 12 +- lua/nordic/platforms/kitty.lua | 57 +++ lua/nordic/platforms/konsole.lua | 90 ++++ lua/nordic/platforms/wezterm.lua | 49 +++ lua/nordic/platforms/windows-terminal.lua | 47 +++ lua/nordic/utils.lua | 3 +- platforms-old/foot/nordic.ini | 23 -- platforms-old/iTerm2/nordic.itermcolors | 357 ---------------- platforms-old/konsole/nordic.colorscheme | 142 ------- platforms-old/wezterm/nordic.toml | 15 - platforms-old/windows-terminal/nordic.json | 23 -- .../fish_themes/nordic.theme | 10 +- platforms/foot/nordic.ini | 35 +- platforms/iTerm2/nordic.itermcolors | 344 ++++++++++++++++ .../kitty/nordic.conf | 22 +- platforms/konsole/nordic.colorscheme | 57 +++ platforms/wezterm/nordic.toml | 34 ++ platforms/windows-terminal/nordic.json | 32 ++ 21 files changed, 1213 insertions(+), 601 deletions(-) create mode 100644 lua/nordic/platforms/fish_themes.lua create mode 100644 lua/nordic/platforms/iTerm2.lua create mode 100644 lua/nordic/platforms/kitty.lua create mode 100644 lua/nordic/platforms/konsole.lua create mode 100644 lua/nordic/platforms/wezterm.lua create mode 100644 lua/nordic/platforms/windows-terminal.lua delete mode 100644 platforms-old/foot/nordic.ini delete mode 100644 platforms-old/iTerm2/nordic.itermcolors delete mode 100644 platforms-old/konsole/nordic.colorscheme delete mode 100644 platforms-old/wezterm/nordic.toml delete mode 100644 platforms-old/windows-terminal/nordic.json rename platforms-old/fish/Nordic.theme => platforms/fish_themes/nordic.theme (81%) create mode 100644 platforms/iTerm2/nordic.itermcolors rename {platforms-old => platforms}/kitty/nordic.conf (64%) create mode 100644 platforms/konsole/nordic.colorscheme create mode 100644 platforms/wezterm/nordic.toml create mode 100644 platforms/windows-terminal/nordic.json diff --git a/lua/nordic/platforms/fish_themes.lua b/lua/nordic/platforms/fish_themes.lua new file mode 100644 index 00000000..2fc7a4a7 --- /dev/null +++ b/lua/nordic/platforms/fish_themes.lua @@ -0,0 +1,43 @@ +local U = require('nordic.utils') + +local M = {} + +function M.generate(colors) + local fishColors = U.removeHash(colors) + + local foot = U.template( + [[ +# Name: Nordic +# Auother: XXiaoA +# https://fishshell.com/docs/current/interactive.html#syntax-highlighting-variables + +# Syntax Highlighting Colors +fish_color_normal ${blue1} +fish_color_command ${yellow.base} +fish_color_keyword ${magenta.base} +fish_color_quote ${green.base} +fish_color_redirection ${white1} +fish_color_end ${white0_normal} +fish_color_error ${error} +fish_color_param ${blue2} +fish_color_comment ${gray4} +fish_color_selection --background=${gray2} +fish_color_search_match --background=${black1} +fish_color_operator ${orange.base} +fish_color_escape ${blue1} +fish_color_autosuggestion ${gray5} + +# Completion Pager Colors +fish_pager_color_progress ${blue1} +fish_pager_color_prefix ${yellow.base} +fish_pager_color_completion ${white1} +fish_pager_color_description ${blue1} +fish_pager_color_selected_background --background=${gray2} +]], + fishColors + ) + + return foot +end + +return M diff --git a/lua/nordic/platforms/foot.lua b/lua/nordic/platforms/foot.lua index 0a6539be..9d864f23 100644 --- a/lua/nordic/platforms/foot.lua +++ b/lua/nordic/platforms/foot.lua @@ -2,32 +2,46 @@ local U = require('nordic.utils') local M = {} ---- @param colors ColorScheme function M.generate(colors) local footColors = U.removeHash(colors) local foot = U.template( [[ [colors] -foreground=${white1} +foreground=${fg} background=${bg} -regular0=${gray2} +# black +regular0=${black0} +bright0=${gray2} + +# red regular1=${red.base} -regular2=${green.base} -regular3=${yellow.base} -regular4=${blue1} -regular5=${magenta.base} -regular6=${cyan.base} -regular7=${white1} -bright0=${gray3} bright1=${red.bright} + +# green +regular2=${green.base} bright2=${green.bright} + +# yellow +regular3=${yellow.base} bright3=${yellow.bright} + +# blue +regular4=${blue0} bright4=${blue2} + +# magenta +regular5=${magenta.base} bright5=${magenta.bright} + +# cyan +regular6=${cyan.base} bright6=${cyan.bright} -bright7=${white2} + +# white +regular7=${white0} +bright7=${white1} ]], footColors ) diff --git a/lua/nordic/platforms/iTerm2.lua b/lua/nordic/platforms/iTerm2.lua new file mode 100644 index 00000000..64a2dbd3 --- /dev/null +++ b/lua/nordic/platforms/iTerm2.lua @@ -0,0 +1,383 @@ +---@param hex string +---@param component string +---@return string +local function get_component(hex, component) + hex = hex:gsub('#', '') + local num + if component == 'r' then + num = tonumber('0x' .. hex:sub(1, 2)) / 255 + elseif component == 'g' then + num = tonumber('0x' .. hex:sub(3, 4)) / 255 + elseif component == 'b' then + num = tonumber('0x' .. hex:sub(5, 6)) / 255 + end + return string.format('%.16f', num) +end + +local function template(str, table) + return ( + str:gsub('($%b{})', function(w) + local parts = vim.split(w:sub(3, -3), '.', { plain = true }) + local hex = vim.tbl_get(table, unpack(parts, 1, #parts - 1)) + return get_component(hex, w:sub(-2, -2)) + end) + ) +end + +local M = {} + +function M.generate(colors) + local foot = template( + [[ + + + + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + ${black0.b} + Color Space + sRGB + Green Component + ${black0.g} + Red Component + ${black0.r} + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + ${red.base.b} + Color Space + sRGB + Green Component + ${red.base.g} + Red Component + ${red.base.r} + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + ${green.bright.b} + Color Space + sRGB + Green Component + ${green.bright.g} + Red Component + ${green.bright.r} + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + ${yellow.bright.b} + Color Space + sRGB + Green Component + ${yellow.bright.g} + Red Component + ${yellow.bright.r} + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + ${blue0.b} + Color Space + sRGB + Green Component + ${blue0.g} + Red Component + ${blue0.r} + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + ${magenta.bright.b} + Color Space + sRGB + Green Component + ${magenta.bright.g} + Red Component + ${magenta.bright.r} + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + ${cyan.bright.b} + Color Space + sRGB + Green Component + ${cyan.bright.g} + Red Component + ${cyan.bright.r} + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + ${white1.b} + Color Space + sRGB + Green Component + ${white1.g} + Red Component + ${white1.r} + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + ${green.base.b} + Color Space + sRGB + Green Component + ${green.base.g} + Red Component + ${green.base.r} + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + ${yellow.base.b} + Color Space + sRGB + Green Component + ${yellow.base.g} + Red Component + ${yellow.base.r} + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + ${blue0.b} + Color Space + sRGB + Green Component + ${blue0.g} + Red Component + ${blue0.r} + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + ${magenta.base.b} + Color Space + sRGB + Green Component + ${magenta.base.g} + Red Component + ${magenta.base.r} + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + ${cyan.base.b} + Color Space + sRGB + Green Component + ${cyan.base.g} + Red Component + ${cyan.base.r} + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + ${white0.b} + Color Space + sRGB + Green Component + ${white0.g} + Red Component + ${white0.r} + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + ${gray2.b} + Color Space + sRGB + Green Component + ${gray2.g} + Red Component + ${gray2.r} + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + ${red.bright.b} + Color Space + sRGB + Green Component + ${red.bright.g} + Red Component + ${red.bright.r} + + Background Color + + Alpha Component + 1 + Blue Component + ${bg.b} + Color Space + sRGB + Green Component + ${bg.g} + Red Component + ${bg.r} + + Badge Color + + Alpha Component + 0.5 + Blue Component + ${blue1.b} + Color Space + sRGB + Green Component + ${blue1.g} + Red Component + ${blue1.r} + + Bold Color + + Alpha Component + 1 + Blue Component + ${cyan.dim.b} + Color Space + sRGB + Green Component + ${cyan.dim.g} + Red Component + ${cyan.dim.r} + + Cursor Color + + Alpha Component + 1 + Blue Component + ${fg.b} + Color Space + sRGB + Green Component + ${fg.g} + Red Component + ${fg.r} + + Cursor Guide Color + + Alpha Component + 0.25 + Blue Component + ${fg.b} + Color Space + sRGB + Green Component + ${fg.g} + Red Component + ${fg.r} + + Cursor Text Color + + Alpha Component + 1 + Blue Component + ${bg.b} + Color Space + sRGB + Green Component + ${bg.g} + Red Component + ${bg.r} + + Foreground Color + + Alpha Component + 1 + Blue Component + ${fg.b} + Color Space + sRGB + Green Component + ${fg.g} + Red Component + ${fg.r} + + Link Color + + Alpha Component + 1 + Blue Component + ${blue1.b} + Color Space + sRGB + Green Component + ${blue1.g} + Red Component + ${blue1.r} + + Selected Text Color + + Alpha Component + 1 + Blue Component + ${fg.b} + Color Space + sRGB + Green Component + ${fg.g} + Red Component + ${fg.r} + + Selection Color + + Alpha Component + 1 + Blue Component + ${bg_selected.b} + Color Space + sRGB + Green Component + ${bg_selected.g} + Red Component + ${bg_selected.r} + + + +]], + colors + ) + + return foot +end + +return M diff --git a/lua/nordic/platforms/init.lua b/lua/nordic/platforms/init.lua index d1c7cb0e..1e581ca5 100644 --- a/lua/nordic/platforms/init.lua +++ b/lua/nordic/platforms/init.lua @@ -11,10 +11,18 @@ local U = require('nordic.utils') local M = {} ---- @type table -- stylua: ignore +---@type table M.platforms = { - foot = { ext = "ini", url = "https://codeberg.org/dnkl/foot" }, + -- fish = { ext = "theme", url = "https://fishshell.com/docs/current/index.html" }, + fish_themes = { ext = "theme", url = "https://fishshell.com/docs/current/interactive.html#syntax-highlighting" }, + foot = { ext = "ini", url = "https://codeberg.org/dnkl/foot" }, + iTerm2 = { ext = "itermcolors", url = "https://iterm2.com/" }, + + kitty = { ext = "conf", url = "https://sw.kovidgoyal.net/kitty/conf.html" }, + konsole = { ext = "colorscheme", url = "https://konsole.kde.org/" }, + wezterm = { ext = "toml", url = "https://wezfurlong.org/wezterm/config/files.html" }, + ["windows-terminal"] = { ext = "json", url = "https://aka.ms/terminal-documentation" }, } function M.setup() diff --git a/lua/nordic/platforms/kitty.lua b/lua/nordic/platforms/kitty.lua new file mode 100644 index 00000000..66a20546 --- /dev/null +++ b/lua/nordic/platforms/kitty.lua @@ -0,0 +1,57 @@ +local U = require('nordic.utils') + +local M = {} + +function M.generate(colors) + local foot = U.template( + [[ +# Nordic Colorscheme for Kitty. +# Based on https://github.com/AlexvZyl/nordic.nvim. +# Author: @AlexvZyl. + +foreground ${fg} +background ${bg} +selection_foreground ${white0} +selection_background ${gray1} +url_color ${blue2} +cursor ${white0} + +# black +color0 ${black0} +color8 ${gray2} + +# red +color1 ${red.base} +color9 ${red.bright} + +# green +color2 ${green.base} +color10 ${green.bright} + +# yellow +color3 ${yellow.base} +color11 ${yellow.bright} + +# blue +color4 ${blue0} +color12 ${blue2} + +# magenta +color5 ${magenta.base} +color13 ${magenta.bright} + +# cyan +color6 ${cyan.base} +color14 ${cyan.bright} + +# white +color7 ${white0} +color15 ${white1} +]], + colors + ) + + return foot +end + +return M diff --git a/lua/nordic/platforms/konsole.lua b/lua/nordic/platforms/konsole.lua new file mode 100644 index 00000000..5f948e31 --- /dev/null +++ b/lua/nordic/platforms/konsole.lua @@ -0,0 +1,90 @@ +local U = require('nordic.utils') + +local function to_rgb(colors) + local output_colors = {} + for k, v in pairs(colors) do + if type(v) == 'string' then + if v == 'NONE' then + output_colors[k] = 'NONE' + else + local r, g, b = U.hex_to_rgb(v) + output_colors[k] = string.format('%d,%d,%d', r, g, b) + end + elseif type(v) == 'table' then + output_colors[k] = to_rgb(v) + end + end + + return output_colors +end + +local M = {} + +function M.generate(colors) + local konsoleColors = to_rgb(colors) + + return U.template( + [[ +[General] +Description=Nordic +Opacity=1 + +[Background] +Color=${bg} + +[Foreground] +Color=${fg} + +# black +[Color0] +Color=${black0} +[Color8] +Color=${gray2} + +# red +[Color1] +Color=${red.base} +[Color9] +Color=${red.bright} + +# green +[Color2] +Color=${green.base} +[Color10] +Color=${green.bright} + +# yellow +[Color3] +Color=${yellow.base} +[Color11] +Color=${yellow.bright} + +# blue +[Color4] +Color=${blue0} +[Color12] +Color=${blue2} + +# magenta +[Color5] +Color=${magenta.base} +[Color13] +Color=${magenta.bright} + +# cyan +[Color6] +Color=${cyan.base} +[Color14] +Color=${cyan.bright} + +# white +[Color7] +Color=${white0} +[Color15] +Color=${white1} +]], + konsoleColors + ) +end + +return M diff --git a/lua/nordic/platforms/wezterm.lua b/lua/nordic/platforms/wezterm.lua new file mode 100644 index 00000000..161622e2 --- /dev/null +++ b/lua/nordic/platforms/wezterm.lua @@ -0,0 +1,49 @@ +local U = require('nordic.utils') + +local M = {} + +function M.generate(colors) + local foot = U.template( + [[ +# Nordic Colorscheme for Wezterm. +# Based on https://github.com/AlexvZyl/nordic.nvim +# Author: @kuntau + +[colors] +foreground = "${fg}" +background = "${bg}" +cursor_bg = "${white1}" +cursor_border = "${white1}" +cursor_fg = "${gray0}" +selection_fg = "${white1}" +selection_bg = "${gray1}" + +ansi = [ + "${black0}", + "${red.base}", + "${green.base}", + "${yellow.base}", + "${blue0}", + "${magenta.base}", + "${cyan.base}", + "${white0}", +] + +brights = [ + "${gray2}", + "${red.bright}", + "${green.bright}", + "${yellow.bright}", + "${blue2}", + "${magenta.bright}", + "${cyan.bright}", + "${white1}", +] +]], + colors + ) + + return foot +end + +return M diff --git a/lua/nordic/platforms/windows-terminal.lua b/lua/nordic/platforms/windows-terminal.lua new file mode 100644 index 00000000..c8af5867 --- /dev/null +++ b/lua/nordic/platforms/windows-terminal.lua @@ -0,0 +1,47 @@ +local U = require('nordic.utils') + +local M = {} + +function M.generate(colors) + local foot = U.template( + [[ +{ + "name": "Nordic", + "cursorColor": "${white0}", + "selectionBackground": "${gray1}", + + "background": "${bg}", + "foreground": "${fg}", + + "black": "${black0}", + "brightBlack": "${gray2}", + + "red": "${red.base}", + "brightRed": "${red.bright}", + + "green": "${green.base}", + "brightGreen": "${green.bright}", + + "yellow": "${yellow.base}", + "brightYellow": "${yellow.bright}", + + "blue": "${blue0}", + "brightBlue": "${blue2}", + + "purple": "${magenta.base}", + "brightPurple": "${magenta.bright}", + + "cyan": "${cyan.base}", + "brightCyan": "${cyan.bright}", + + "white": "${white0}", + "brightWhite": "${white1}", +} +]], + colors + ) + + return foot +end + +return M diff --git a/lua/nordic/utils.lua b/lua/nordic/utils.lua index 0b56da65..b93d5fed 100644 --- a/lua/nordic/utils.lua +++ b/lua/nordic/utils.lua @@ -112,13 +112,12 @@ end function M.template(str, table) return ( str:gsub('($%b{})', function(w) - -- TODO: unpack is depreciated return vim.tbl_get(table, unpack(vim.split(w:sub(3, -2), '.', { plain = true }))) or w end) ) end --- Remove the hash (#) from the beginning of all color values in a table +---Remove the hash (#) from the beginning of all color values in a table ---@param colors table function M.removeHash(colors) local output_colors = {} diff --git a/platforms-old/foot/nordic.ini b/platforms-old/foot/nordic.ini deleted file mode 100644 index 3dc7a929..00000000 --- a/platforms-old/foot/nordic.ini +++ /dev/null @@ -1,23 +0,0 @@ -# Nordic Colorscheme for foot. -# Based on https://github.com/AlexvZyl/nordic.nvim -# Author: @filahf - -[colors] -foreground=D8DEE9 -background=242933 -regular0=3B4252 -regular1=BF616A -regular2=A3BE8C -regular3=EBCB8B -regular4=81A1C1 -regular5=B48EAD -regular6=8FBCBB -regular7=D8DEE9 -bright0=3B4252 -bright1=D06F79 -bright2=B1D196 -bright3=F0D399 -bright4=88C0D0 -bright5=C895BF -bright6=93CCDC -bright7=E5E9F0 diff --git a/platforms-old/iTerm2/nordic.itermcolors b/platforms-old/iTerm2/nordic.itermcolors deleted file mode 100644 index 81093535..00000000 --- a/platforms-old/iTerm2/nordic.itermcolors +++ /dev/null @@ -1,357 +0,0 @@ - - - - - Ansi 0 Color - - Alpha Component - 1 - Blue Component - 0.14117647707462311 - Color Space - sRGB - Green Component - 0.10980392247438431 - Red Component - 0.098039217293262482 - - Ansi 1 Color - - Alpha Component - 1 - Blue Component - 0.41568627953529358 - Color Space - sRGB - Green Component - 0.3803921639919281 - Red Component - 0.74901962280273438 - - Ansi 10 Color - - Alpha Component - 1 - Blue Component - 0.58823531866073608 - Color Space - sRGB - Green Component - 0.81960785388946533 - Red Component - 0.69411766529083252 - - Ansi 11 Color - - Alpha Component - 1 - Blue Component - 0.60000002384185791 - Color Space - sRGB - Green Component - 0.82745099067687988 - Red Component - 0.94117647409439087 - - Ansi 12 Color - - Alpha Component - 1 - Blue Component - 0.82352942228317261 - Color Space - sRGB - Green Component - 0.68627452850341797 - Red Component - 0.54901963472366333 - - Ansi 13 Color - - Alpha Component - 1 - Blue Component - 0.74901962280273438 - Color Space - sRGB - Green Component - 0.58431375026702881 - Red Component - 0.78431373834609985 - - Ansi 14 Color - - Alpha Component - 1 - Blue Component - 0.86274510622024536 - Color Space - sRGB - Green Component - 0.80000001192092896 - Red Component - 0.57647061347961426 - - Ansi 15 Color - - Alpha Component - 1 - Blue Component - 0.83137255907058716 - Color Space - sRGB - Green Component - 0.76470589637756348 - Red Component - 0.73333334922790527 - - Ansi 2 Color - - Alpha Component - 1 - Blue Component - 0.54901963472366333 - Color Space - sRGB - Green Component - 0.7450980544090271 - Red Component - 0.63921570777893066 - - Ansi 3 Color - - Alpha Component - 1 - Blue Component - 0.54509806632995605 - Color Space - sRGB - Green Component - 0.79607844352722168 - Red Component - 0.92156863212585449 - - Ansi 4 Color - - Alpha Component - 1 - Blue Component - 0.75686275959014893 - Color Space - sRGB - Green Component - 0.63137257099151611 - Red Component - 0.5058823823928833 - - Ansi 5 Color - - Alpha Component - 1 - Blue Component - 0.67843139171600342 - Color Space - sRGB - Green Component - 0.55686277151107788 - Red Component - 0.70588237047195435 - - Ansi 6 Color - - Alpha Component - 1 - Blue Component - 0.73333334922790527 - Color Space - sRGB - Green Component - 0.73725491762161255 - Red Component - 0.56078433990478516 - - Ansi 7 Color - - Alpha Component - 1 - Blue Component - 0.83137255907058716 - Color Space - sRGB - Green Component - 0.76470589637756348 - Red Component - 0.73333334922790527 - - Ansi 8 Color - - Alpha Component - 1 - Blue Component - 0.44705882668495178 - Color Space - sRGB - Green Component - 0.43921568989753723 - Red Component - 0.44705882668495178 - - Ansi 9 Color - - Alpha Component - 1 - Blue Component - 0.47450980544090271 - Color Space - sRGB - Green Component - 0.43529412150382996 - Red Component - 0.81568628549575806 - - Background Color - - Alpha Component - 1 - Blue Component - 0.20000000298023224 - Color Space - sRGB - Green Component - 0.16078431904315948 - Red Component - 0.14117647707462311 - - Badge Color - - Alpha Component - 0.517730712890625 - Blue Component - 0.53333336114883423 - Color Space - sRGB - Green Component - 0.3803921639919281 - Red Component - 1 - - Bold Color - - Alpha Component - 1 - Blue Component - 0.91372549533843994 - Color Space - sRGB - Green Component - 0.87058824300765991 - Red Component - 0.84705883264541626 - - Cursor Color - - Alpha Component - 1 - Blue Component - 0.53333336114883423 - Color Space - sRGB - Green Component - 0.3803921639919281 - Red Component - 1 - - Cursor Guide Color - - Alpha Component - 0.15686274509803921 - Blue Component - 0.0 - Color Space - sRGB - Green Component - 0.0 - Red Component - 0.0 - - Cursor Text Color - - Alpha Component - 1 - Blue Component - 0.83137255907058716 - Color Space - sRGB - Green Component - 0.76470589637756348 - Red Component - 0.73333334922790527 - - Foreground Color - - Alpha Component - 1 - Blue Component - 0.83137255907058716 - Color Space - sRGB - Green Component - 0.76470589637756348 - Red Component - 0.73333334922790527 - - Link Color - - Alpha Component - 1 - Blue Component - 0.81568628549575806 - Color Space - sRGB - Green Component - 0.74901962280273438 - Red Component - 0.53333336114883423 - - Selected Text Color - - Alpha Component - 1 - Blue Component - 0.83137255907058716 - Color Space - sRGB - Green Component - 0.76470589637756348 - Red Component - 0.73333334922790527 - - Selection Color - - Alpha Component - 1 - Blue Component - 0.14117647707462311 - Color Space - sRGB - Green Component - 0.10980392247438431 - Red Component - 0.098039217293262482 - - Tab Color - - Alpha Component - 1 - Blue Component - 0.16078431904315948 - Color Space - sRGB - Green Component - 0.16078431904315948 - Red Component - 0.16078431904315948 - - - diff --git a/platforms-old/konsole/nordic.colorscheme b/platforms-old/konsole/nordic.colorscheme deleted file mode 100644 index 53c0af57..00000000 --- a/platforms-old/konsole/nordic.colorscheme +++ /dev/null @@ -1,142 +0,0 @@ -[Background] -Color=25,28,36 - -[BackgroundFaint] -Color=25,28,36 - -[BackgroundIntense] -Color=25,28,36 - -[Color0] -Color=25,28,36 - -[Color0Faint] -Color=25,28,36 - -[Color0Intense] -Color=25,28,36 - -[Color1] -Color=191,97,106 - -[Color10] -Color=177,209,150 - -[Color10Intense] -Color=177,209,150 - -[Color11] -Color=240,211,153 - -[Color11Intense] -Color=240,211,153 - -[Color12] -Color=140,175,210 - -[Color12Intense] -Color=140,175,210 - -[Color13] -Color=200,149,191 - -[Color13Intense] -Color=200,149,191 - -[Color14] -Color=147,204,220 - -[Color14Intense] -Color=147,204,220 - -[Color15] -Color=187,195,212 - -[Color15Intense] -Color=187,195,212 - -[Color1Faint] -Color=191,97,106 - -[Color1Intense] -Color=191,97,106 - -[Color2] -Color=163,190,140 - -[Color2Faint] -Color=163,190,140 - -[Color2Intense] -Color=163,190,140 - -[Color3] -Color=235,203,139 - -[Color3Faint] -Color=235,203,139 - -[Color3Intense] -Color=235,203,139 - -[Color4] -Color=129,161,193 - -[Color4Faint] -Color=129,161,193 - -[Color4Intense] -Color=129,161,193 - -[Color5] -Color=180,142,173 - -[Color5Faint] -Color=180,142,173 - -[Color5Intense] -Color=180,142,173 - -[Color6] -Color=143,188,187 - -[Color6Faint] -Color=143,188,187 - -[Color6Intense] -Color=143,188,187 - -[Color7] -Color=187,195,212 - -[Color7Faint] -Color=187,195,212 - -[Color7Intense] -Color=187,195,212 - -[Color8] -Color=114,112,114 - -[Color8Intense] -Color=114,112,114 - -[Color9] -Color=208,111,121 - -[Color9Intense] -Color=208,111,121 - -[Foreground] -Color=187,195,212 - -[ForegroundFaint] -Color=187,195,212 - -[ForegroundIntense] -Color=187,195,212 - -[General] -Description=Nordic -Opacity=1 -Wallpaper= diff --git a/platforms-old/wezterm/nordic.toml b/platforms-old/wezterm/nordic.toml deleted file mode 100644 index d8ff7123..00000000 --- a/platforms-old/wezterm/nordic.toml +++ /dev/null @@ -1,15 +0,0 @@ -# Nordic Colorscheme for Wezterm. -# Based on https://github.com/AlexvZyl/nordic.nvim -# Author: @kuntau - -[colors] -foreground = "#D8DEE9" -background = "#242933" -cursor_bg = "#D8DEE9" -cursor_border = "#D8DEE9" -cursor_fg = "#242933" -selection_fg = "#D8DEE9" -selection_bg = "#2E3440" - -ansi = [ "#191D24", "#BF616A", "#A3BE8C", "#EBCB8B", "#81A1C1", "#B48EAD", "#8FBCBB", "#D8DEE9", ] -brights = [ "#3B4252", "#D06F79", "#B1D196", "#F0D399", "#88C0D0", "#C895BF", "#93CCDC", "#E5E9F0", ] diff --git a/platforms-old/windows-terminal/nordic.json b/platforms-old/windows-terminal/nordic.json deleted file mode 100644 index a99efba2..00000000 --- a/platforms-old/windows-terminal/nordic.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "background": "#242933", - "black": "#191D24", - "blue": "#81A1C1", - "brightBlack": "#191D24", - "brightBlue": "#8CAFD2", - "brightCyan": "#93CCDC", - "brightGreen": "#B1D196", - "brightPurple": "#C895BF", - "brightRed": "#D06F79", - "brightWhite": "#D8DEE9", - "brightYellow": "#F0D399", - "cursorColor": "#B48EAD", - "cyan": "#8FBCBB", - "foreground": "#BBC3D4", - "green": "#A3BE8C", - "name": "Nordic", - "purple": "#B48EAD", - "red": "#BF616A", - "selectionBackground": "#2E3440", - "white": "#BBC3D4", - "yellow": "#EBCB8B" -} diff --git a/platforms-old/fish/Nordic.theme b/platforms/fish_themes/nordic.theme similarity index 81% rename from platforms-old/fish/Nordic.theme rename to platforms/fish_themes/nordic.theme index 39e6e72f..b581fffe 100644 --- a/platforms-old/fish/Nordic.theme +++ b/platforms/fish_themes/nordic.theme @@ -8,14 +8,14 @@ fish_color_command EBCB8B fish_color_keyword B48EAD fish_color_quote A3BE8C fish_color_redirection D8DEE9 -fish_color_end BBC4D4 -fish_color_error BF616A -fish_color_param 69A7BA +fish_color_end BBC3D4 +fish_color_error C5727A +fish_color_param 88C0D0 fish_color_comment 4C566A fish_color_selection --background=3B4252 -fish_color_search_match --background=1c2029 +fish_color_search_match --background=1E222A fish_color_operator D08770 -fish_color_escape 93CCDC +fish_color_escape 81A1C1 fish_color_autosuggestion 60728A # Completion Pager Colors diff --git a/platforms/foot/nordic.ini b/platforms/foot/nordic.ini index bc55dffd..55ae8362 100644 --- a/platforms/foot/nordic.ini +++ b/platforms/foot/nordic.ini @@ -1,20 +1,35 @@ [colors] -foreground=D8DEE9 +foreground=C0C8D8 background=242933 -regular0=3B4252 +# black +regular0=191D24 +bright0=3B4252 + +# red regular1=BF616A -regular2=A3BE8C -regular3=EBCB8B -regular4=81A1C1 -regular5=B48EAD -regular6=8FBCBB -regular7=D8DEE9 -bright0=434C5E bright1=C5727A + +# green +regular2=A3BE8C bright2=B1C89D + +# yellow +regular3=EBCB8B bright3=EFD49F + +# blue +regular4=5E81AC bright4=88C0D0 + +# magenta +regular5=B48EAD bright5=BE9DB8 + +# cyan +regular6=8FBCBB bright6=9FC6C5 -bright7=E5E9F0 + +# white +regular7=C0C8D8 +bright7=D8DEE9 diff --git a/platforms/iTerm2/nordic.itermcolors b/platforms/iTerm2/nordic.itermcolors new file mode 100644 index 00000000..a9be6127 --- /dev/null +++ b/platforms/iTerm2/nordic.itermcolors @@ -0,0 +1,344 @@ + + + + + Ansi 0 Color + + Alpha Component + 1 + Blue Component + 0.1411764705882353 + Color Space + sRGB + Green Component + 0.1137254901960784 + Red Component + 0.0980392156862745 + + Ansi 1 Color + + Alpha Component + 1 + Blue Component + 0.4156862745098039 + Color Space + sRGB + Green Component + 0.3803921568627451 + Red Component + 0.7490196078431373 + + Ansi 10 Color + + Alpha Component + 1 + Blue Component + 0.6156862745098040 + Color Space + sRGB + Green Component + 0.7843137254901961 + Red Component + 0.6941176470588235 + + Ansi 11 Color + + Alpha Component + 1 + Blue Component + 0.6235294117647059 + Color Space + sRGB + Green Component + 0.8313725490196079 + Red Component + 0.9372549019607843 + + Ansi 12 Color + + Alpha Component + 1 + Blue Component + 0.6745098039215687 + Color Space + sRGB + Green Component + 0.5058823529411764 + Red Component + 0.3686274509803922 + + Ansi 13 Color + + Alpha Component + 1 + Blue Component + 0.7215686274509804 + Color Space + sRGB + Green Component + 0.6156862745098040 + Red Component + 0.7450980392156863 + + Ansi 14 Color + + Alpha Component + 1 + Blue Component + 0.7725490196078432 + Color Space + sRGB + Green Component + 0.7764705882352941 + Red Component + 0.6235294117647059 + + Ansi 15 Color + + Alpha Component + 1 + Blue Component + 0.9137254901960784 + Color Space + sRGB + Green Component + 0.8705882352941177 + Red Component + 0.8470588235294118 + + Ansi 2 Color + + Alpha Component + 1 + Blue Component + 0.5490196078431373 + Color Space + sRGB + Green Component + 0.7450980392156863 + Red Component + 0.6392156862745098 + + Ansi 3 Color + + Alpha Component + 1 + Blue Component + 0.5450980392156862 + Color Space + sRGB + Green Component + 0.7960784313725490 + Red Component + 0.9215686274509803 + + Ansi 4 Color + + Alpha Component + 1 + Blue Component + 0.6745098039215687 + Color Space + sRGB + Green Component + 0.5058823529411764 + Red Component + 0.3686274509803922 + + Ansi 5 Color + + Alpha Component + 1 + Blue Component + 0.6784313725490196 + Color Space + sRGB + Green Component + 0.5568627450980392 + Red Component + 0.7058823529411765 + + Ansi 6 Color + + Alpha Component + 1 + Blue Component + 0.7333333333333333 + Color Space + sRGB + Green Component + 0.7372549019607844 + Red Component + 0.5607843137254902 + + Ansi 7 Color + + Alpha Component + 1 + Blue Component + 0.8470588235294118 + Color Space + sRGB + Green Component + 0.7843137254901961 + Red Component + 0.7529411764705882 + + Ansi 8 Color + + Alpha Component + 1 + Blue Component + 0.3215686274509804 + Color Space + sRGB + Green Component + 0.2588235294117647 + Red Component + 0.2313725490196079 + + Ansi 9 Color + + Alpha Component + 1 + Blue Component + 0.4784313725490196 + Color Space + sRGB + Green Component + 0.4470588235294118 + Red Component + 0.7725490196078432 + + Background Color + + Alpha Component + 1 + Blue Component + 0.2000000000000000 + Color Space + sRGB + Green Component + 0.1607843137254902 + Red Component + 0.1411764705882353 + + Badge Color + + Alpha Component + 0.5 + Blue Component + 0.7568627450980392 + Color Space + sRGB + Green Component + 0.6313725490196078 + Red Component + 0.5058823529411764 + + Bold Color + + Alpha Component + 1 + Blue Component + 0.6980392156862745 + Color Space + sRGB + Green Component + 0.7019607843137254 + Red Component + 0.5019607843137255 + + Cursor Color + + Alpha Component + 1 + Blue Component + 0.8470588235294118 + Color Space + sRGB + Green Component + 0.7843137254901961 + Red Component + 0.7529411764705882 + + Cursor Guide Color + + Alpha Component + 0.25 + Blue Component + 0.8470588235294118 + Color Space + sRGB + Green Component + 0.7843137254901961 + Red Component + 0.7529411764705882 + + Cursor Text Color + + Alpha Component + 1 + Blue Component + 0.2000000000000000 + Color Space + sRGB + Green Component + 0.1607843137254902 + Red Component + 0.1411764705882353 + + Foreground Color + + Alpha Component + 1 + Blue Component + 0.8470588235294118 + Color Space + sRGB + Green Component + 0.7843137254901961 + Red Component + 0.7529411764705882 + + Link Color + + Alpha Component + 1 + Blue Component + 0.7568627450980392 + Color Space + sRGB + Green Component + 0.6313725490196078 + Red Component + 0.5058823529411764 + + Selected Text Color + + Alpha Component + 1 + Blue Component + 0.8470588235294118 + Color Space + sRGB + Green Component + 0.7843137254901961 + Red Component + 0.7529411764705882 + + Selection Color + + Alpha Component + 1 + Blue Component + 0.3215686274509804 + Color Space + sRGB + Green Component + 0.2588235294117647 + Red Component + 0.2313725490196079 + + + diff --git a/platforms-old/kitty/nordic.conf b/platforms/kitty/nordic.conf similarity index 64% rename from platforms-old/kitty/nordic.conf rename to platforms/kitty/nordic.conf index 46866427..7ca73447 100644 --- a/platforms-old/kitty/nordic.conf +++ b/platforms/kitty/nordic.conf @@ -2,12 +2,12 @@ # Based on https://github.com/AlexvZyl/nordic.nvim. # Author: @AlexvZyl. -foreground #D8DEE9 +foreground #C0C8D8 background #242933 -selection_foreground #D8DEE9 +selection_foreground #C0C8D8 selection_background #2E3440 url_color #88C0D0 -cursor #D8DEE9 +cursor #C0C8D8 # black color0 #191D24 @@ -15,28 +15,28 @@ color8 #3B4252 # red color1 #BF616A -color9 #D06F79 +color9 #C5727A # green color2 #A3BE8C -color10 #B1D196 +color10 #B1C89D # yellow color3 #EBCB8B -color11 #F0D399 +color11 #EFD49F # blue -color4 #81A1C1 +color4 #5E81AC color12 #88C0D0 # magenta color5 #B48EAD -color13 #C895BF +color13 #BE9DB8 # cyan color6 #8FBCBB -color14 #93CCDC +color14 #9FC6C5 # white -color7 #D8DEE9 -color15 #E5E9F0 +color7 #C0C8D8 +color15 #D8DEE9 diff --git a/platforms/konsole/nordic.colorscheme b/platforms/konsole/nordic.colorscheme new file mode 100644 index 00000000..5137e5e4 --- /dev/null +++ b/platforms/konsole/nordic.colorscheme @@ -0,0 +1,57 @@ +[General] +Description=Nordic +Opacity=1 + +[Background] +Color=36,41,51 + +[Foreground] +Color=192,200,216 + +# black +[Color0] +Color=25,29,36 +[Color8] +Color=59,66,82 + +# red +[Color1] +Color=191,97,106 +[Color9] +Color=197,114,122 + +# green +[Color2] +Color=163,190,140 +[Color10] +Color=177,200,157 + +# yellow +[Color3] +Color=235,203,139 +[Color11] +Color=239,212,159 + +# blue +[Color4] +Color=94,129,172 +[Color12] +Color=136,192,208 + +# magenta +[Color5] +Color=180,142,173 +[Color13] +Color=190,157,184 + +# cyan +[Color6] +Color=143,188,187 +[Color14] +Color=159,198,197 + +# white +[Color7] +Color=192,200,216 +[Color15] +Color=216,222,233 diff --git a/platforms/wezterm/nordic.toml b/platforms/wezterm/nordic.toml new file mode 100644 index 00000000..6cb23726 --- /dev/null +++ b/platforms/wezterm/nordic.toml @@ -0,0 +1,34 @@ +# Nordic Colorscheme for Wezterm. +# Based on https://github.com/AlexvZyl/nordic.nvim +# Author: @kuntau + +[colors] +foreground = "#C0C8D8" +background = "#242933" +cursor_bg = "#D8DEE9" +cursor_border = "#D8DEE9" +cursor_fg = "#242933" +selection_fg = "#D8DEE9" +selection_bg = "#2E3440" + +ansi = [ + "#191D24", + "#BF616A", + "#A3BE8C", + "#EBCB8B", + "#5E81AC", + "#B48EAD", + "#8FBCBB", + "#C0C8D8", +] + +brights = [ + "#3B4252", + "#C5727A", + "#B1C89D", + "#EFD49F", + "#88C0D0", + "#BE9DB8", + "#9FC6C5", + "#D8DEE9", +] diff --git a/platforms/windows-terminal/nordic.json b/platforms/windows-terminal/nordic.json new file mode 100644 index 00000000..346f53e3 --- /dev/null +++ b/platforms/windows-terminal/nordic.json @@ -0,0 +1,32 @@ +{ + "name": "Nordic", + "cursorColor": "#C0C8D8", + "selectionBackground": "#2E3440", + + "background": "#242933", + "foreground": "#C0C8D8", + + "black": "#191D24", + "brightBlack": "#3B4252", + + "red": "#BF616A", + "brightRed": "#C5727A", + + "green": "#A3BE8C", + "brightGreen": "#B1C89D", + + "yellow": "#EBCB8B", + "brightYellow": "#EFD49F", + + "blue": "#5E81AC", + "brightBlue": "#88C0D0", + + "purple": "#B48EAD", + "brightPurple": "#BE9DB8", + + "cyan": "#8FBCBB", + "brightCyan": "#9FC6C5", + + "white": "#C0C8D8", + "brightWhite": "#D8DEE9", +}