From b45a689495448b36ab06e8b433ceee70357430ea Mon Sep 17 00:00:00 2001 From: ftqo Date: Mon, 25 Mar 2024 12:38:42 -0400 Subject: [PATCH 1/2] add flexoki theme --- runtime/themes/flexoki_dark.toml | 20 +++++++ runtime/themes/flexoki_light.toml | 96 +++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 runtime/themes/flexoki_dark.toml create mode 100644 runtime/themes/flexoki_light.toml diff --git a/runtime/themes/flexoki_dark.toml b/runtime/themes/flexoki_dark.toml new file mode 100644 index 000000000000..759f019b8cde --- /dev/null +++ b/runtime/themes/flexoki_dark.toml @@ -0,0 +1,20 @@ +inherits = "flexoki_light" + +[palette] +tx = "#CECDC3" +tx-2 = "#878580" +tx-3 = "#575653" +ui-3 = "#403E3C" +ui-2 = "#343331" +ui = "#282726" +bg-2 = "#1C1B1A" +bg = "#100F0F" + +re = "#D14D41" +or = "#DA702C" +ye = "#D0A215" +gr = "#879A39" +cy = "#3AA99F" +bl = "#4385BE" +pu = "#8B7EC8" +ma = "#CE5D97" diff --git a/runtime/themes/flexoki_light.toml b/runtime/themes/flexoki_light.toml new file mode 100644 index 000000000000..fa5f01f25cad --- /dev/null +++ b/runtime/themes/flexoki_light.toml @@ -0,0 +1,96 @@ +# Based on Flexoki: https://stephango.com/flexoki + +"ui.background" = { bg = "bg" } +"ui.cursor" = { fg = "tx", bg = "tx-3" } +"ui.cursor.primary" = { fg = "bg", bg = "tx" } +"ui.cursor.match" = { modifiers = ["bold"] } +"ui.linenr" = "tx-3" +"ui.linenr.selected" = "tx" +"ui.selection" = { bg = "ui-2" } +"ui.statusline" = { fg = "tx", bg = "bg-2" } +"ui.statusline.normal" = { fg = "bg", bg = "bl" } +"ui.statusline.insert" = { fg = "bg", bg = "or" } +"ui.statusline.select" = { fg = "bg", bg = "ma" } +"ui.cursorline" = { bg = "bg-2" } +"ui.popup" = { fg = "tx", bg = "bg-2" } +"ui.window" = "tx" +"ui.help" = { fg = "tx", bg = "bg" } +"ui.text" = "tx" +"ui.text.focus" = { bg = "bg-2", fg = "tx" } +"ui.text.info" = "tx" +"ui.virtual.whitespace" = "bg-2" +"ui.virtual.ruler" = { bg = "tx" } +"ui.virtual.inlay-hint" = { fg = "tx-3", bg = "bg" } +"ui.virtual.jump-label" = { bg = "bg-2", modifiers = ["bold"]} +"ui.menu" = { fg = "tx", bg = "bg" } +"ui.menu.selected" = { bg = "ui", fg = "tx" } +"ui.debug" = { fg = "or", bg = "bg" } +"ui.highlight.frameline" = { bg = "ye" } +"diagnostic.hint" = { underline = { color = "bl", style = "curl" } } +"diagnostic.info" = { underline = { color = "bl", style = "curl" } } +"diagnostic.warning" = { underline = { color = "ye", style = "curl" } } +"diagnostic.error" = { underline = { color = "re", style = "curl" } } +"hint" = { fg = "bl", modifiers = ["bold"] } +"info" = { fg = "ye", modifiers = ["bold"] } +"warning" = { fg = "or", modifiers = ["bold"] } +"error" = { fg = "re", modifiers = ["bold"] } + +"attribute" = "ye" +"type" = "ye" +"constructor" = "gr" +"constant" = "pu" +"constant.builtin" = "ye" +"string" = "cy" +"string.regexp" = "or" +"string.special" = "ye" +"comment" = "tx-3" +"variable" = "tx" +"variable.builtin" = "ma" +"variable.other" = "bl" +"punctuation" = "tx-2" +"keyword" = "gr" +"keyword.control" = "re" +"keyword.control.conditional" = "gr" +"keyword.control.import" = "ye" +"keyword.control.return" = "gr" +"keyword.function" = "gr" +"keyword.storage.type" = "bl" +"keyword.storage.modifier" = "bl" +"operator" = "tx-2" +"function" = "or" +"tag" = "bl" +"namespace" = "re" + +"markup.heading" = "or" +"markup.list" = "ye" +"markup.bold" = { fg = "or", modifiers = ["bold"] } +"markup.italic" = { fg = "or", modifiers = ["italic"] } +"markup.strikethrough" = { modifiers = ["crossed_out"] } +"markup.raw.block" = "or" +"markup.link.url" = "bl" +"markup.link.text" = "ye" +"markup.link.label" = "gr" +"markup.quote" = "ye" +"markup.raw" = "bl" +"diff.plus" = "gr" +"diff.minus" = "re" +"diff.delta" = "ye" + +[palette] +tx = "#100F0F" +tx-2 = "#6F6E69" +tx-3 = "#B7B5AC" +ui-3 = "#CECDC3" +ui-2 = "#DAD8CE" +ui = "#E6E4D9" +bg-2 = "#F2F0E5" +bg = "#FFFCF0" + +re = "#AF3029" +or = "#BC5215" +ye = "#AD8301" +gr = "#66800B" +cy = "#24837B" +bl = "#205EA6" +pu = "#5E409D" +ma = "#A02F6F" From 8fe56c2daaf8bccb1edb1b7ed475dddcfa8ecfe2 Mon Sep 17 00:00:00 2001 From: ftqo Date: Tue, 26 Mar 2024 13:05:01 -0400 Subject: [PATCH 2/2] change ruler color to bg-2 --- runtime/themes/flexoki_light.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/themes/flexoki_light.toml b/runtime/themes/flexoki_light.toml index fa5f01f25cad..b506ab428e82 100644 --- a/runtime/themes/flexoki_light.toml +++ b/runtime/themes/flexoki_light.toml @@ -19,7 +19,7 @@ "ui.text.focus" = { bg = "bg-2", fg = "tx" } "ui.text.info" = "tx" "ui.virtual.whitespace" = "bg-2" -"ui.virtual.ruler" = { bg = "tx" } +"ui.virtual.ruler" = { bg = "bg-2" } "ui.virtual.inlay-hint" = { fg = "tx-3", bg = "bg" } "ui.virtual.jump-label" = { bg = "bg-2", modifiers = ["bold"]} "ui.menu" = { fg = "tx", bg = "bg" }