From 2db382548520cd4594abd9480f13834eee67bb02 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sat, 28 Sep 2024 05:36:38 -0700 Subject: [PATCH 01/20] add aurara and aura themes added my heavily-customized variation of the aura theme (aurara), and a port of the original aura theme in two variations (dark and dark soft). Also added a license for noctis theme, which was already ported. --- runtime/themes/aura-dark-soft.toml | 145 ++++++++++ runtime/themes/aura-dark.toml | 143 ++++++++++ runtime/themes/aurara.toml | 350 +++++++++++++++++++++++++ runtime/themes/licenses/aura.LICENSE | 21 ++ runtime/themes/licenses/noctis.LICENSE | 9 + 5 files changed, 668 insertions(+) create mode 100644 runtime/themes/aura-dark-soft.toml create mode 100644 runtime/themes/aura-dark.toml create mode 100644 runtime/themes/aurara.toml create mode 100644 runtime/themes/licenses/aura.LICENSE create mode 100644 runtime/themes/licenses/noctis.LICENSE diff --git a/runtime/themes/aura-dark-soft.toml b/runtime/themes/aura-dark-soft.toml new file mode 100644 index 000000000..417093c28 --- /dev/null +++ b/runtime/themes/aura-dark-soft.toml @@ -0,0 +1,145 @@ +# aura ported by: +# Author: elainabialkowski + +# aura originally by: +# Author: Dalton Menezes +# License: MIT + +"ui.background" = { fg = "white", bg = "black"} + +"ui.linenr" = { fg = "accent17"} +"ui.linenr.selected" = { bg = "accent33", modifiers = ["bold"]} + +"ui.statusline" = { fg = "accent10", bg = "accent24"} + +"ui.selection" = { bg = "purple_selection"} +"ui.selection.background" = { fg = "purple_selection"} + +"ui.cursor" = { fg = "black", bg = "pink" } +"ui.cursor.match" = { fg = "purple", modifiers = ["bold"] } + +"ui.text" = { fg = "white"} +"ui.text.focus" = { fg = "white", bg = "purple_selection_solid" } +"ui.text.inactive" = { fg = "gray" } + +"ui.virtual.indent-guide" = "accent13" +"ui.virtual.ruler" = { bg = "accent13" } +"ui.virtual.whitespace" = { fg = "accent13" } +"ui.virtual.inlay-hint" = { fg = "accent9", bg = "accent33" } +"ui.virtual.jump-label" = { fg = "pink" , modifiers = ["bold"] } + +"ui.highlight" = { bg = "accent33", modifiers = ["bold"] } + +"ui.menu" = { fg = "accent9", bg = "accent24"} +"ui.menu.selected" = { fg = "purple", bg = "accent33"} + +"ui.popup" = { fg = "accent9", bg = "accent24"} + +"ui.window" = { fg = "green" } + +"diagnostic.error" = { underline = { color = "red", style = "curl" } } +"diagnostic.warning" = { underline = { color = "orange" , style = "curl" } } +"diagnostic.info" = { underline = { color = "blue" , style = "curl" } } +"diagnostic.hint" = { underline = { color = "blue" , style = "curl" } } +"diagnostic.unnecessary" = { modifiers = ["dim"] } +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } + +error = "red" +warning = "orange" +info = "blue" +hint = "blue" + +attributes = "purple" +type = "blue" + +constructor = "blue" + +constant = "green" +string = "green" + +comment = {fg = "gray" } + +variable = "white" # should be dimmed +"variable.builtin" = "purple" +"variable.other" = "pink" + +"punctuation.delimeter" = "pink" +"punctuation.special" = "white" + +keyword = "purple" +operator = "purple" + +function = "orange" +tag = "purple" + +markup = "purple" +"markup.heading" = "orange" +"markup.quote" = "gray" +"markup.list" = "purple" +"markup.link.url" = { fg = "green" , modifiers = ["underlined"]} + +"diff.plus" = "green" +"diff.delta" = "orange" +"diff.minus" = "red" + +[palette] +# dark soft/dim +purple = "#8464c6" # 132,100,198 accent1 primary color +purple_selection = "#3d375e7f" # 61,55,94 accent20 selections +purple_selection_solid = "#29263c" # 41,38,60 accent38 selections (without alpha) +green = "#54c59f" # 84,197,159 accent2 secondary color +orange = "#c7a06f" # 199,160,111 accent3 tertiary color +pink = "#c17ac8" # 193,122,200 accent6 quaternary color +blue = "#6cb2c7" # 108,178,199 accent32 quinary color +red = "#c55858" # 197,88,88 accent5 senary color +white = "#bdbdbd" # 189,189,189 accent7 foregrounds +gray = "#6d6d6d" # 109,109,109 accent8 comments +black = "#15141b" # 21,20,27 accent12 backgrounds + + +# https://github.com/daltonmenezes/aura-theme/blob/main/src/core/colors/schemes/common.ts +# commonColors = { +# accent0 = "#0f0f0f" # black +# ... +# accent4 = "#9dff65" # bright green +# ... +# accent31 = "#ffca85" # bright orange +# accent32 = "#82e2ff" # light blue!! +# accent33 = "#24222c" # black +# accent34 = "#00000000" # fully transparent, +# accent35 = "#525156" # activity bar inactive foreground, +# # } + +# export const commonUI = { +accent9 = "#cdccce" # black +accent10 = "#adacae" # light grey +accent13 = "#2d2d2d" # black +# accent14 = "#af8aff7f" # light purple +# accent15 = "#4d4d4d" +# accent16 = "#ffffff00" +accent17 = "#a394f033" # secondary-selection +# accent18 = "#a394f000" # light purple +# accent19 = "#3ea7847f" +# accent20 = "#3d375e7f" # primary-selection +# accent22 = "#4d466e" +# accent23 = "#3b334b" +# accent25 = "#49c29a" +# accent26 = "#00d89023" +# accent27 = "#ff474720" +# accent28 = "#121016" +# accent29 = "#000000" +# accent30 = "#2d2b38" +accent33 = "#2e2b38" +# accent36 = "#a19c77" # debugging background +# accent37 = "#353424" # breakpoint frame highlight +# accent38 = "#29263c" # primary-selection without alpha +# accent39 = "#211D26" +# }c', +# accent34 = "#00000000" # fully transparent, +# accent35 = "#525156" # activity bar inactive foreground, +# } + +# https://github.com/daltonmenezes/aura-theme/tree/c607be79c8eeaa5a5d7ac66421f8b5c51d936fe8/src/core/colors/schemes +accent24 = "#1f1a27" # soft dark + + diff --git a/runtime/themes/aura-dark.toml b/runtime/themes/aura-dark.toml new file mode 100644 index 000000000..28d28e9b2 --- /dev/null +++ b/runtime/themes/aura-dark.toml @@ -0,0 +1,143 @@ +# aura ported by: +# Author: elainabialkowski + +# aura originally by: +# Author: Dalton Menezes +# License: MIT + +"ui.background" = { fg = "white", bg = "black"} + +"ui.linenr" = { fg = "accent17"} +"ui.linenr.selected" = { bg = "accent33", modifiers = ["bold"]} + +"ui.statusline" = { fg = "accent10", bg = "accent24"} + +"ui.selection" = { bg = "purple_selection"} +"ui.selection.background" = { fg = "purple_selection"} + +"ui.cursor" = { fg = "black", bg = "pink" } +"ui.cursor.match" = { fg = "purple", modifiers = ["bold"] } + +"ui.text" = { fg = "white"} +"ui.text.focus" = { fg = "white", bg = "purple_selection_solid" } +"ui.text.inactive" = { fg = "gray" } + +"ui.virtual.indent-guide" = "accent13" +"ui.virtual.ruler" = { bg = "accent13" } +"ui.virtual.whitespace" = { fg = "accent13" } +"ui.virtual.inlay-hint" = { fg = "accent9", bg = "accent33" } +"ui.virtual.jump-label" = { fg = "pink" , modifiers = ["bold"] } + +"ui.highlight" = { bg = "accent33", modifiers = ["bold"] } + +"ui.menu" = { fg = "accent9", bg = "accent24"} +"ui.menu.selected" = { fg = "purple", bg = "accent33"} + +"ui.popup" = { fg = "accent9", bg = "accent24"} + +"ui.window" = { fg = "green" } + +"diagnostic.error" = { underline = { color = "red", style = "curl" } } +"diagnostic.warning" = { underline = { color = "orange" , style = "curl" } } +"diagnostic.info" = { underline = { color = "blue" , style = "curl" } } +"diagnostic.hint" = { underline = { color = "blue" , style = "curl" } } +"diagnostic.unnecessary" = { modifiers = ["dim"] } +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } + +error = "red" +warning = "orange" +info = "blue" +hint = "blue" + +attributes = "purple" +type = "blue" + +constructor = "blue" + +constant = "green" +string = "green" + +comment = {fg = "gray" } + +variable = "white" # should be dimmed +"variable.builtin" = "purple" +"variable.other" = "pink" + +"punctuation.delimeter" = "pink" +"punctuation.special" = "white" + +keyword = "purple" +operator = "purple" + +function = "orange" +tag = "purple" + +markup = "purple" +"markup.heading" = "orange" +"markup.quote" = "gray" +"markup.list" = "purple" +"markup.link.url" = { fg = "green" , modifiers = ["underlined"]} + +"diff.plus" = "green" +"diff.delta" = "orange" +"diff.minus" = "red" + +[palette] +# dark +purple = "#a277ff" # 162,119,255 accent1 Primary color +purple_selection = "#3d375e7f" # 61,55,94 accent20 Selections +purple_selection_solid = "#29263c" # 41,38,60 accent38 Selections (without alpha) +green = "#61ffca" # 97,255,202 accent2 Secondary color +orange = "#ffca85" # 255,202,133 accent3 Tertiary color +pink = "#f694ff" # 246,148,255 accent6 Quaternary color +blue = "#82e2ff" # 130,226,255 accent32 Quinary color +red = "#ff6767" # 255,103,103 accent5 Senary color +white = "#edecee" # 237,236,238 accent7 Foregrounds +gray = "#6d6d6d" # 109,109,109 accent8 Comments +black = "#15141b" # 21,20,27 accent12 Backgrounds + + +# https://github.com/daltonmenezes/aura-theme/blob/main/src/core/colors/schemes/common.ts +# commonColors = { +# accent0 = "#0f0f0f" # black +# ... +# accent4 = "#9dff65" # bright green +# ... +# accent32 = "#82e2ff" # light blue!! +# accent33 = "#24222c" # black +# accent34 = "#00000000" # fully transparent, +# accent35 = "#525156" # activity bar inactive foreground, +# # } + +# export const commonUI = { +accent9 = "#cdccce" # black +accent10 = "#adacae" # light grey +accent13 = "#2d2d2d" # black +# accent14 = "#af8aff7f" # light purple +# accent15 = "#4d4d4d" +# accent16 = "#ffffff00" +accent17 = "#a394f033" # secondary-selection +# accent18 = "#a394f000" # light purple +# accent19 = "#3ea7847f" +# accent20 = "#3d375e7f" # primary-selection +# accent22 = "#4d466e" +# accent23 = "#3b334b" +# accent25 = "#49c29a" +# accent26 = "#00d89023" +# accent27 = "#ff474720" +# accent28 = "#121016" +# accent29 = "#000000" +# accent30 = "#2d2b38" +accent33 = "#2e2b38" +# accent36 = "#a19c77" # debugging background +# accent37 = "#353424" # breakpoint frame highlight +# accent38 = "#29263c" # primary-selection without alpha +# accent39 = "#211D26" +# }c', +# accent34 = "#00000000" # fully transparent, +# accent35 = "#525156" # activity bar inactive foreground, +# } + +# https://github.com/daltonmenezes/aura-theme/tree/c607be79c8eeaa5a5d7ac66421f8b5c51d936fe8/src/core/colors/schemes +accent24 = "#1f1a27" # soft dark + diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml new file mode 100644 index 000000000..70c39f8c5 --- /dev/null +++ b/runtime/themes/aurara.toml @@ -0,0 +1,350 @@ +# aurara +# a messy mix of aura (dark, soft), noctis, and liberal use of helix's text styling +# Author : rahil/rathewolf + +# aura ported by: +# Author: elainabialkowski + +# aura originally by: +# Author: Dalton Menezes +# License: MIT + +# noctis ported by: +# Author: 0rphee +# who used this template: https://github.com/n0s4/helix-theme-template + +# noctis originally by: +# Author: Liviu Schera and contributors +# License: MIT + + +# TODO: +# test dimmed comments some more, seems too tough to see on transparent backgrounds.. +# maybe add a fallback for every table..? +# figure out how to get alpha workin'.. +# get a dim color for var/let/mut keyword + # currently using the same purple as operators.. which isn't too bad though, as it keeps a consistent scheme.. and it doesn't conflict with anything either. it's also good as a fallback for 'end', as that sometimes doesn't highlight properly.. +# punctuation.delimiter not working + +# NOTE: +# struct counts as a keyword, not a type, which can be confusing.. maybe there's more keyword properties..?? +# blinking doesn't work with italics, another reason to not italicize comments +# can fetch syntax highlighting tests from here: + # https://github.com/sharkdp/bat + + +## GENERAL ============================== + +"warning" = { fg ="orange-warning", modifiers = ["bold"] } # Editor warnings. TEMP/TEST/WARN +"error" = { fg = "red-error", modifiers = ["bold", "slow_blink"] } # Editor errors, like mis-typing a command. BUG ISSUE + # but not ERROR..? +"info" = { fg = "blue-aqua" } # Code diagnostic info in gutter (LSP). TODO/INFO + # def prefer noctis's blue-aqua over aura's here +"hint" = { fg = "cyan", modifiers = ["bold", "dim"] } # Code diagnostics hint in gutter (LSP). + # ? Difference between info and hint ? +"diagnostic" = { modifiers = ["underlined"] } # Code diagnostics in editing area (LSP). +"diagnostic.unnecessary" = { modifiers = ["dim"] } # took this from default theme +"diagnostic.deprecated" = { modifiers = ["crossed_out"] } # took this from default theme +# UI ============================== +# For styling helix itself. + +'ui.background' = { fg = "purple-pleasant", bg = "bg"} # Default background color., the fg seems to be used for borders.. +'ui.window' = { fg = "purple-pleasant" } # Window border between splits. + +'ui.gutter' = { fg = "orange-warning"} # Left gutter for diagnostics and breakpoints. + +'ui.text' = { fg = "purple-pleasant" } # Default text color. used in text files, pickers, ui, and more! +'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. +'ui.text.info' = { fg = "pink", bg ="bg" } # Info popup contents (space mode menu). + # NOTE: pink pops out, making it better than the comfy purple-pleasant here +'ui.text.inactive' = { fg = "gray-stone" } # i think used in autocomplete suggestion.. + # TODO: a little hard to see, but i like it better than white-stone and purple-darker.. + +'ui.cursor' = { fg = "light-green-complement", bg = "light-green", modifiers = ["reversed", "bold" ] } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c). + # should be slightly darker than primary cursor.. +'ui.cursor.primary' = { fg = "pink", bg = "light-green", modifiers = ["reversed", "bold"] } # The primary cursor when there are multiple (shift-c). + # TODO: NOTE: this blinking at a different timing then the selection's blink is too much!! lol, but i do prefer it to blink.. +# 'ui.cursor.insert' = { fg = "pink", bg = "light-green", modifiers = ["reversed", "bold"] } # The cursor in insert mode (i). +# 'ui.cursor.select' = { fg = "pink", bg = "light-green", modifiers = ["reversed", "bold"] } # The cursor in select mode (v). +'ui.cursor.match' = { fg = "cyan", bg = "pink", modifiers = ["bold", "reversed", "slow_blink"] } # The matching parentheses of that under the cursor. + # NOTE: changed from purple, which was a bit tough to see..; rapid_blink was just too annoying..; light-green was too much, trying cyan.. + +'ui.selection' = { bg = "selection-ui", modifiers = [ "bold", "slow_blink" ] } # All currently selected text. + # TODO: decide purple-selection vs the neutral selection-ui: purple is easier to see immediately, but the neutral selection shows text more clearly / less muddy, and with the aid of blinking, it's pretty easy to see too +# 'ui.selection.primary' = { bg = "purple-selection" } # The primary selection when there are multiple. +# 'ui.cursorline.primary' = { bg = 'purple-selection' } # + # TODO: would need a very dim color, between selection and background + +'ui.linenr' = { fg = "purple-pleasant", modifiers = ["dim"]} # Line numbers. +'ui.linenr.selected' = { modifiers = [ "bold" ] } # Current line number. + +'ui.virtual' = { fg = "purple-selection" } # Namespace for additions to the editing area. +'ui.virtual.ruler' = { bg = "selection-ui"} # Vertical rulers (colored columns in editing area). + # TODO: TEST: haven't seen these two yet.. +'ui.virtual.whitespace' = { fg = "gray-stone"} # Whitespace markers in editing area: newline.. +'ui.virtual.indent-guide' = { fg = "marker13" } # Indentation guides. + +'ui.statusline' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # Status line. and tab bar + # NOTE: matches line numbers +'ui.statusline.inactive' = { fg = "gray-stone", bg = "bg-ui", modifiers = [] } # Status line in unfocused windows. + # TODO: too dim, likely inherited, but i don't know how to uninherit it.. + +"ui.statusline.normal" = { fg = "purple-pleasant" } +"ui.statusline.insert" = { fg = "pink-salmon", modifiers = [] } + # matches return keyword +"ui.statusline.select" = { fg = "blue-aqua", modifiers = [] } + # seems dark, even without dim.. not sure how inheritance works here.. + # slow_blink on insert/select was too annoying.. + # using a colored background was also too annoying + +'ui.help' = { bg = "bg", fg = "pink"} # `:command` descriptions above the command line. + +'ui.highlight' = { bg = "selection-ui", modifiers = ["slow_blink"] } # selected contents of symbol pickers (spc-s, spc-S) and current line in buffer picker (spc-b). + +'ui.menu' = { fg = "pink", bg = "bg" } # Autocomplete menu. + # pink is a nice change from purple-pleasant.. +'ui.menu.selected' = { bg = "selection-ui", fg = "gold", modifiers = ["bold"] } # Selected autocomplete item. + # not a fan of slow_blink here.. + # gold is fantastic for selected text and fuzzy matching + +'ui.popup' = { fg = "purple-pleasant", bg = "bg" } # Documentation popups (space-k). +'ui.popup.info' = { fg = "pink", bg = "bg" } # Info popups box (space mode menu). + # bold was just too much.. the pink is nice tho! vs purple-pleasant + # it seems ui.text.info overrides this..?? + +# SYNTAX HIGHLIGHTING ============================== +# All the keys here are Treesitter scopes. + +'property' = { fg = "green-aqua" } # Regex group names. + # TODO: no clue.. never seen this.. just matching regex strings for now.. +'special' = { fg = "gold", modifiers = ["bold"] } # Special symbols e.g `?` in Rust, `...` in Hare. +'attribute' = { fg = "purple" } # Class attributes, html tag attributes. + +'type' = { fg = "blue-aqua" } # Variable type, like integer or string, including program defined classes, structs etc.. + # NOTE: sometimes there's class / end, which looks odd not bolded like other control/end statements +'type.builtin' = { fg = "green-sea" } # Primitive types of the language (string, int, float). + # dark-blue was just too ugly.. this is still a funky sea green.. TODO: this is still a funky sea green.. +'type.enum.variant' = { fg = "green-sea" } # A variant of an enum. + # NOTE: i think was pink in aura theme.. but i def didn't like that for the enum values TODO: maybe white is fine + +'constructor' = { fg = "blue-aqua" } # Constructor method for a class or struct. And in some cases applies to module names, as in ruby + # was blue-aqua in noctis, it's pink in vs-code's aura, along with static... TODO: maybe could try a new color here.. + # ruby's class seems to use this.. maybe best to stick to using the same color as type.., but then __init__ uses this too..; also used upon constructor call! Ok(), Some() in rust + +'constant' = { fg = "green-aqua" } # Constant value + # originally green in aura... and it seems a pretty good use of this green, as i don't use it for strings anymore.. + # green feels good for numbers, literals, escape-sequence +# 'constant.builtin' = { fg = "blue-aqua" } # Special constants like `true`, `false`, `none`, etc. +# 'constant.builtin.boolean' = { } # True or False. +# 'constant.character' = { fg = "blue-aqua"} # Constant of character type. +# 'constant.character.escape' = { fg = "mid-green", modifiers = ["bold"] } # escape codes like \n. + # NOTE: matches regexp +# 'constant.numeric' = { fg = "dark-blue", modifiers = ["bold"] } # constant integer or float value. +# 'constant.numeric.integer' = { } # constant integer value. +# 'constant.numeric.float' = { fg = "green-aqua" } # constant float value. + +'string' = { fg = "purple-pleasant" } # String literal. + # changed to use main text color (purple!) TODO: can decrease alpha more if needed +'string.regexp' = { fg = "green-aqua" } # Regular expression literal. + # NOTE: matches character escape +'string.special' = { fg = "purple-pleasant", modifiers = ["italic"] } # Strings containing a path, URL, etc. + # could use something funky 'n dark here.. + # i hate long underlined text!, so def don't want that.. + # TODO: TEST: italics +# 'string.special.path' = { } # String containing a file path. +# 'string.special.url' = { } # String containing a web URL. +'string.special.symbol' = { fg = "berry-desaturated" } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords. + # secondary text (pink) collides with punctuation :/ + +'comment' = { fg = "gray-stone", modifiers = ["dim"] } # This is a comment. + # TODO: dim and italics should be optional + # TODO: this is beautiful when it's dim, but with a transparent background, it can be tough to see.. + # even purple-pleasant dimmed doesn't look bad.. +# 'comment.line' = { } # Line comments, like this. +# 'comment.block' = { } # Block comments, like /* this */ in some languages. +'comment.block.documentation' = { fg = "gray-stone", modifiers = ["italic"] } # Doc comments, e.g '///' in rust. + # TODO: TEST: maybe okay to use italics here.. + +'variable' = { fg = "white-stone" } # Variable names. +'variable.builtin' = { fg = "blue-aqua" } # Language reserved variables: `this`, `self`, `super`, etc. + # NOTE: matches class color +'variable.parameter' = { fg = "white-stone" } # Function parameters. + # TODO: this would be really useful to differentiate.. white-sea-tinged isn't too bad.. +# 'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions). + # TODO: could use another color here.. +'variable.function' = { fg = "orange-brighter" } # ? ruby-like everything is an object..? +# NOTE: variable.other = "pink" in aura ?? + +'label' = { fg = "purple" } # Loop labels in rust. + +'punctuation' = { fg = "pink", modifiers = ["bold"] } # (){}[]:;,. + # NOTE: the bolded gold from noctic is really, really nice, but it collides with the orange-brighter color; also, bolded white is too much white, should save white just for variables only +'punctuation.delimeter' = { fg = "gold", modifiers = ["bold"] } # Commas and colons. + # TODO: BUG: not working..?? TEST: gold +'punctuation.bracket' = { fg = "pink", modifiers = ["bold"] } # Parentheses, angle brackets, etc. + +'keyword' = { fg = "purple" } # Language reserved keywords. var, void, struct, let, mut, was accent18 TODO: try it + # TODO: could use another color here.. something that doesn't stick out.. snazzy's yellow is too bright (and dim too dim), maybe a purple-dark with less alpha..? +'keyword.control' = { fg = "purple", modifiers = ["bold"] } # Control keywords. +'keyword.control.conditional' = { fg = "purple", modifiers = ["bold"] } # 'if', 'else', 'elif'. + # TODO: could use a cascading shades of purple here, between purple and purple-darker of operator, darkest on the outside, yet it's also nice to have it consistent.. +# 'keyword.control.repeat' = { } # 'for', 'while', 'loop'. +'keyword.control.import' = { fg = "orange", modifiers = ["italic", "bold"] } # 'import', 'export' ('use'?). +'keyword.control.return' = { fg = "pink-salmon", modifiers = ["italic"] } # 'return' in most languages. + # NOTE: tried red, but it's so ugly!!.. :/ but could use it's own color.. stole noctis's pink-salmon here.. bold is really nice too, more pink-salmony, but it eventually bugged me..; italics makes it feel like it's *pressed* in +'keyword.control.exception' = { fg = "pink-salmon", modifiers = ["italic"] } # 'raise' in python. +'keyword.operator' = { fg = "purple-darker" } # 'or', 'and', 'in'. +'keyword.directive' = { fg = "purple", modifiers = ["italic"] } # Preprocessor directives (#if, #include in C). +'keyword.function' = { fg = "purple", modifiers = ["bold"] } # The keyword to define a funtion: 'def', 'fun', 'fn'. + +'operator' = { fg = "purple-darker", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators + +# top three are ordered from brightest to darkest +'function' = { fg = "orange-brighter"} +'function.method' = { fg = "orange" } # Class / Struct methods. +'function.builtin' = { fg = "gold-dim" } + # TODO: TEST: gold-dim and orange-warning TODO: try minimus's yellow-orange +'function.macro' = { fg = "gold", modifiers = ["italic"] } # Like macros in rust. +'function.special' = { fg = "orange-brighter", modifiers = ["italic"] } # Preprocessor in C. + # package, import + +'tag' = { fg = "purple-darker" } # As in for html. + # must be darker then the default text + +'namespace' = { fg = "dark-blue", modifiers = ["italic"] } # * Namespace keyword in java, C#, etc. + # namespace::function, namespace::class, package main, *types.Tuple + # requires a seperate color + # TODO: this nasty dark-blue accurately matches how i feel about namespace syntax..: *barf*.. + +# Markup ============================== +# Colors for markup languages, like Markdown or XML. also affects comments!! + +# a little different from code since it's so simple, using a simple two color scheme: purple 'n gold +# NOTE: it inherits the main text color from ui.text, and punctuation too + +markup = "purple-pleasant" # fallback + +'markup.heading' = { fg = "orange-brighter", modifiers = ["bold"] } # Markdown headings +# TODO: gold vs orange-brighter, i really just like the bolded gold, but if it's too bright, orange-brighter is perfect +# 'markup.heading.1' = { } # Markdown heading 1 color. +# 'markup.heading.2' = { } # Markdown heading 2 color. +# 'markup.heading.3' = { } # Markdown heading 3 color. +# 'markup.heading.4' = { } # Markdown heading 4 color. +# 'markup.heading.5' = { } # Markdown heading 5 color. +# 'markup.heading.6' = { } # Markdown heading 6 color. +'markup.heading.marker' = { fg = "gold" } # Hashtag color on Markdown headings. + # bolded gold is too distracting.. + +'markup.list' = { fg = "gold", modifiers = ["bold"] } + # the bullet symbols are like shiny jewelry in the sea :) +# 'markup.list.numbered' = { } # Numbered list. +# 'markup.list.unnumbered' = { } # Bullet point list. + +'markup.bold' = { fg = "orange" } # Bold text. + # bold text isn't so easy to read.. but purple bold works pretty well alongside purple-pleasant + # this orange is surprisingly dim! not bad at all, and keeps a consistent two-color theme +'markup.italic' = { modifiers = ["italic"] } # Italicised text. + +'markup.link' = { modifiers = ["underline"] } + # different color is annoying in comments +# 'markup.link.url' = { } # Urls pointed to by links. +# 'markup.link.label' = { } # Non-URL link references. +# 'markup.link.text' = { fg = "purple-pleasant"} # URL and image descriptions in links. + +'markup.quote' = { fg = "gray-stone" } # `> Quotes` in Markdown. + + +# Markup - Interface ============================== +# "These scopes are used for theming the editor interface." + +'markup.normal' = { } +'markup.normal.completion' = { } # For completion doc popup ui. +'markup.normal.raw' = { } # For hover popup ui. + +'markup.heading.completion' = { } # Headings for completion doc popup ui. +'markup.heading.raw' = { } # Headings for hover popup ui. + +'markup.raw' = { } # Code block in Markdown. +'markup.raw.block' = { } # Multiline (```) codeblock in Markdown. +'markup.raw.inline' = { } # `Inline code block` in Markdown. +'markup.raw.inline.completion' = { } # ? +'markup.raw.inline.hover' = { } # ? + +# Diff ============================== +# Version control changes. + +'diff.plus' = "green-aqua" # { } # Additions. +'diff.minus' = "red-error" # { } # Deletions. +'diff.delta' = "orange-warning" # { } # Modifications. +'diff.delta.moved' = "green-sea" # Renamed or moved files / changes. + + +[palette] # Define your custom colors here. +# NOTE: there are 16 colors in the palette by default, these will override any that have the same name + +# noctis +# dark-green = "#00262a" # backgrounds +# mid-green = "#073a40" # highlights +# autocomp-green = "#0d6772" # lighter than mid-green + # these three were used for backgrounds +light-green = "#48e9a7" # a nice sea green, bright neon when bolded, like the displays of deep sea instruments, was "green", re-used for text under the cursor + +pink-salmon = "#df769b" # re-used for return, was "pink", it's perfect! :D use sparingly as i really don't like themes with lots of red in it, only returns and maybe exceptions +gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", ..maybe was also used for it's variable text..? +purple-darker = "#6f60ea" # this purple is slightly darker than aura's, used for cascading keywords, but seems to match vs-code's aura better?? +white-sea-tinged = "#b1cace" # has a tinge of green in it.., pleasant tho +orange = "#e4b782" # looks fantastic in noctics, fit for the sea theme, like a clown-fish, using it for functions +green-dark = "#5b858b" # mainly for comments/background text, was "gray" +red = "#e34e1b" + +dark-blue = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. +blue-aqua = "#47ace8" # currently used for types, a pretty standard blue for classes.. +cyan = "#87efff" # a tad bit too bright.. + + +# aura dark soft/dim +purple = "#8464c6" +purple-selection = "#3d375e7f" +purple-selection-solid = "#29263c" +green-aqua = "#54c59f" # used for constants/literals, not the prettiest, but it fits the aqua sea feelin' of the overall theme.. maybe can try bogster's green +orange-warning = "#c7a06f" # warning, like a dim hazard sign +pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation at the moment.. +green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable +red-error = "#c55858" # error, looks great when blinking, like red flashing like underwater! +white-stone = "#bdbdbd" # variable, has a dim tinge of dirty stone to it +gray-stone = "#6d6d6d" # comment, similar to white, but desaturated/grayed out, now a sort of dirty blonde; i didn't like it at first, but then became amazing once dimmed!! +# gray-stone-dimmed = "#6d6d6d80" # 80 = 50%, 40 = 25% + # TODO: alpha doesn't seem to affect these, only dim works.. +bg = "#15141b" # was "black" + +orange-brighter = "#ffca85" # brighter than noctis's orange +purple-pleasant = "#a394f033" # great comfy purp for ui, should be main color, used for text (in .txt files) and strings and ui, was accent17 + +# aura colors shared between variations +# text10 = "#adacae" # TODO: try it +bg-ui = "#1f1a27" # soft dark, used in ui background, status line, tab bar, seems similar to purple-selection, was accent24 + +# somewhere hidden in aura +selection-ui = "#2e2b38" # no purple tinge, more closer to gray-stone, was accent33 +marker13 = "#2d2d2d" # a barely visible gray + +# others scraped from aura +# cyan-aura = "#82e2ff" # seems like noctis's cyan.. also sticks out too much.. +# purple14 = "#af8aff7f" # light purple TODO: try it +# purple-pleasant-opaque = "#a394f000" # purple-pleasant with 00 alpha (opaque?), was accent18 + # NOTE: doesn't seem to make a difference.. + +# new colors +light-green-complement = "#e9488a" # initially used to create a high-contrast color for match surrounding pairs but it was too fugly to use as a cursor.. pink is better. currently using for secondary cursors as it's darker than the primary cursor's pink + +# from boo berry +berry-desaturated = "#886C9C" # originally used for comments, but didn't quite work.. maybe because boo berry has a background color..; didn't quite work for keywords either, as it was too dim and didn't match the rest of the scheme, like dirty blood.. worth keeping! currently using for atoms, which isn't bad!.. +gold-dim = "#E3C0A8" # a really nice, dim color, more yellow than orange tho + +# TODO: try checking out noctis variants minimus and uva + +# this site seems fine for buildings shades of a color.. + # https://www.radix-ui.com/colors/custom + +# this site seems fun too.. + # coolors.co diff --git a/runtime/themes/licenses/aura.LICENSE b/runtime/themes/licenses/aura.LICENSE new file mode 100644 index 000000000..584856f80 --- /dev/null +++ b/runtime/themes/licenses/aura.LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 - * Dalton Menezes + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/runtime/themes/licenses/noctis.LICENSE b/runtime/themes/licenses/noctis.LICENSE new file mode 100644 index 000000000..44dde4404 --- /dev/null +++ b/runtime/themes/licenses/noctis.LICENSE @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2018 Liviu Schera + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 8736fb8309dbca2982599b3a6c4bdef424f7e125 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sat, 28 Sep 2024 21:59:18 -0700 Subject: [PATCH 02/20] brighten comments --- runtime/themes/aurara.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 70c39f8c5..7f9aa319a 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -156,7 +156,7 @@ 'string.special.symbol' = { fg = "berry-desaturated" } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords. # secondary text (pink) collides with punctuation :/ -'comment' = { fg = "gray-stone", modifiers = ["dim"] } # This is a comment. +'comment' = { fg = "gray-stone-lighter", modifiers = ["dim"] } # This is a comment. # TODO: dim and italics should be optional # TODO: this is beautiful when it's dim, but with a transparent background, it can be tough to see.. # even purple-pleasant dimmed doesn't look bad.. @@ -313,7 +313,8 @@ green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable red-error = "#c55858" # error, looks great when blinking, like red flashing like underwater! white-stone = "#bdbdbd" # variable, has a dim tinge of dirty stone to it gray-stone = "#6d6d6d" # comment, similar to white, but desaturated/grayed out, now a sort of dirty blonde; i didn't like it at first, but then became amazing once dimmed!! -# gray-stone-dimmed = "#6d6d6d80" # 80 = 50%, 40 = 25% + # gray-stone-dimmed = "#6d6d6d80" # 80 = 50%, 40 = 25% +gray-stone-lighter = "#858585" # used for comments with the dim modifier; 9d9d9d dimmed seems slightly brighter than gray-stone undimmed.. 7d7d7d is out of the way, 858585 forces eyes to read it, vs 8d8d8d? # TODO: alpha doesn't seem to affect these, only dim works.. bg = "#15141b" # was "black" @@ -341,6 +342,8 @@ light-green-complement = "#e9488a" # initially used to create a high-contrast co berry-desaturated = "#886C9C" # originally used for comments, but didn't quite work.. maybe because boo berry has a background color..; didn't quite work for keywords either, as it was too dim and didn't match the rest of the scheme, like dirty blood.. worth keeping! currently using for atoms, which isn't bad!.. gold-dim = "#E3C0A8" # a really nice, dim color, more yellow than orange tho +# TODO: "shades of purple" theme has an actual orangey orange, a nice fuschia/deep purple, a good red, and a cyan that isn't too bright + # TODO: try checking out noctis variants minimus and uva # this site seems fine for buildings shades of a color.. From dafaa65e5555275a590e49157964edb502a46b53 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sun, 29 Sep 2024 00:16:22 -0700 Subject: [PATCH 03/20] update aurara theme: details, details.. --- runtime/themes/aurara.toml | 77 +++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 26 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 7f9aa319a..e6151a13a 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -19,12 +19,11 @@ # TODO: -# test dimmed comments some more, seems too tough to see on transparent backgrounds.. # maybe add a fallback for every table..? # figure out how to get alpha workin'.. + # how does this differ from saturation? # get a dim color for var/let/mut keyword # currently using the same purple as operators.. which isn't too bad though, as it keeps a consistent scheme.. and it doesn't conflict with anything either. it's also good as a fallback for 'end', as that sometimes doesn't highlight properly.. -# punctuation.delimiter not working # NOTE: # struct counts as a keyword, not a type, which can be confusing.. maybe there's more keyword properties..?? @@ -35,16 +34,22 @@ ## GENERAL ============================== -"warning" = { fg ="orange-warning", modifiers = ["bold"] } # Editor warnings. TEMP/TEST/WARN -"error" = { fg = "red-error", modifiers = ["bold", "slow_blink"] } # Editor errors, like mis-typing a command. BUG ISSUE +'warning' = { fg ="orange-warning", modifiers = ["bold"] } # Editor warnings. TEMP/TEST/WARN +'error' = { fg = "red-error", modifiers = ["bold", "slow_blink"] } # Editor errors, like mis-typing a command. BUG ISSUE # but not ERROR..? -"info" = { fg = "blue-aqua" } # Code diagnostic info in gutter (LSP). TODO/INFO +'info' = { fg = "blue-aqua" } # Code diagnostic info in gutter (LSP). TODO/INFO # def prefer noctis's blue-aqua over aura's here -"hint" = { fg = "cyan", modifiers = ["bold", "dim"] } # Code diagnostics hint in gutter (LSP). +'hint' = { fg = "cyan", modifiers = ["bold", "dim"] } # Code diagnostics hint in gutter (LSP). # ? Difference between info and hint ? -"diagnostic" = { modifiers = ["underlined"] } # Code diagnostics in editing area (LSP). -"diagnostic.unnecessary" = { modifiers = ["dim"] } # took this from default theme -"diagnostic.deprecated" = { modifiers = ["crossed_out"] } # took this from default theme + +'diagnostic' = { modifiers = ["underlined"] } # Code diagnostics in editing area (LSP). +'diagnostic.unnecessary' = { modifiers = ["dim"] } # took this from default theme +'diagnostic.deprecated' = { modifiers = ["crossed_out"] } # took this from default theme +'diagnostic.error' = { underline = { style = "curl", color = "red-error" }, modifiers = ["bold", "slow_blink", "dim"] } +'diagnostic.hint' = { underline = { style = "line", color = "cyan" }, modifiers = ["bold", "dim"] } +'diagnostic.info' = { underline = { style = "line", color = "blue-aqua" }, modifiers = ["bold", "dim"] } + # TODO: TEST: diagnostics, might need a new set of colors..! can use all neon colors here!! + # UI ============================== # For styling helix itself. @@ -73,17 +78,24 @@ # TODO: decide purple-selection vs the neutral selection-ui: purple is easier to see immediately, but the neutral selection shows text more clearly / less muddy, and with the aid of blinking, it's pretty easy to see too # 'ui.selection.primary' = { bg = "purple-selection" } # The primary selection when there are multiple. # 'ui.cursorline.primary' = { bg = 'purple-selection' } # - # TODO: would need a very dim color, between selection and background + # TODO: would need a very dim color, between selection-ui and background.. it could work of primary selection has a tinge of color to it (purple-selection), but without that, it would make it even harder to see the selection + +# 'ui.highlight.frameline' = { bg = "selection-ui" } # hmmm, not sure.. 'ui.linenr' = { fg = "purple-pleasant", modifiers = ["dim"]} # Line numbers. 'ui.linenr.selected' = { modifiers = [ "bold" ] } # Current line number. 'ui.virtual' = { fg = "purple-selection" } # Namespace for additions to the editing area. 'ui.virtual.ruler' = { bg = "selection-ui"} # Vertical rulers (colored columns in editing area). - # TODO: TEST: haven't seen these two yet.. + # TODO: TEST: haven't seen these two yet..error 'ui.virtual.whitespace' = { fg = "gray-stone"} # Whitespace markers in editing area: newline.. 'ui.virtual.indent-guide' = { fg = "marker13" } # Indentation guides. +# 'ui.bufferline' = { fg = "red-error"} +# 'ui.bufferline.active' = { modifiers = ["underline"] } # doesn't work.. +# 'ui.bufferline.inactive' # also doesn't work.. + # using ui.statusline instead: + 'ui.statusline' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # Status line. and tab bar # NOTE: matches line numbers 'ui.statusline.inactive' = { fg = "gray-stone", bg = "bg-ui", modifiers = [] } # Status line in unfocused windows. @@ -111,6 +123,7 @@ 'ui.popup.info' = { fg = "pink", bg = "bg" } # Info popups box (space mode menu). # bold was just too much.. the pink is nice tho! vs purple-pleasant # it seems ui.text.info overrides this..?? +# "ui.menu.scroll" = { } # SYNTAX HIGHLIGHTING ============================== # All the keys here are Treesitter scopes. @@ -133,7 +146,7 @@ 'constant' = { fg = "green-aqua" } # Constant value # originally green in aura... and it seems a pretty good use of this green, as i don't use it for strings anymore.. - # green feels good for numbers, literals, escape-sequence + # NOTE: if this is too dark, can use light-green, as there aren't too many of these.. # 'constant.builtin' = { fg = "blue-aqua" } # Special constants like `true`, `false`, `none`, etc. # 'constant.builtin.boolean' = { } # True or False. # 'constant.character' = { fg = "blue-aqua"} # Constant of character type. @@ -179,9 +192,10 @@ 'punctuation' = { fg = "pink", modifiers = ["bold"] } # (){}[]:;,. # NOTE: the bolded gold from noctic is really, really nice, but it collides with the orange-brighter color; also, bolded white is too much white, should save white just for variables only -'punctuation.delimeter' = { fg = "gold", modifiers = ["bold"] } # Commas and colons. - # TODO: BUG: not working..?? TEST: gold +'punctuation.delimiter' = { fg = "pink-hot", modifiers = ["bold"] } # Commas and colons. + # TODO: TEST: i might just prefer the same pink for consistency.. though this is very very slight..! 'punctuation.bracket' = { fg = "pink", modifiers = ["bold"] } # Parentheses, angle brackets, etc. +'punctuation.special' = { fg = "gold", modifiers = ["bold"] } # no clue.. 'keyword' = { fg = "purple" } # Language reserved keywords. var, void, struct, let, mut, was accent18 TODO: try it # TODO: could use another color here.. something that doesn't stick out.. snazzy's yellow is too bright (and dim too dim), maybe a purple-dark with less alpha..? @@ -193,9 +207,14 @@ 'keyword.control.return' = { fg = "pink-salmon", modifiers = ["italic"] } # 'return' in most languages. # NOTE: tried red, but it's so ugly!!.. :/ but could use it's own color.. stole noctis's pink-salmon here.. bold is really nice too, more pink-salmony, but it eventually bugged me..; italics makes it feel like it's *pressed* in 'keyword.control.exception' = { fg = "pink-salmon", modifiers = ["italic"] } # 'raise' in python. -'keyword.operator' = { fg = "purple-darker" } # 'or', 'and', 'in'. +'keyword.operator' = { fg = "purple-darker", modifiers = ["bold"] } # 'or', 'and', 'in'. + # TODO: doesn't look like it's working..?? 'keyword.directive' = { fg = "purple", modifiers = ["italic"] } # Preprocessor directives (#if, #include in C). 'keyword.function' = { fg = "purple", modifiers = ["bold"] } # The keyword to define a funtion: 'def', 'fun', 'fn'. +'keyword.storage' = { fg = "purple" } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? var?? namespace?.. lots!! + # only makes sense to bold in C#.. + # NOTE: struct and var should match type.builtin + 'operator' = { fg = "purple-darker", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators @@ -224,6 +243,12 @@ markup = "purple-pleasant" # fallback +'markup.bold' = { fg = "orange" } # Bold text. + # bold text isn't so easy to read.. but purple bold works pretty well alongside purple-pleasant + # this orange is surprisingly dim! not bad at all, and keeps a consistent two-color theme +'markup.italic' = { modifiers = ["italic"] } # Italicised text. +"markup.strikethrough" = { modifiers = ["crossed_out"] } + 'markup.heading' = { fg = "orange-brighter", modifiers = ["bold"] } # Markdown headings # TODO: gold vs orange-brighter, i really just like the bolded gold, but if it's too bright, orange-brighter is perfect # 'markup.heading.1' = { } # Markdown heading 1 color. @@ -237,21 +262,19 @@ markup = "purple-pleasant" # fallback 'markup.list' = { fg = "gold", modifiers = ["bold"] } # the bullet symbols are like shiny jewelry in the sea :) -# 'markup.list.numbered' = { } # Numbered list. +'markup.list.numbered' = { fg = "gold" } # Numbered list. # 'markup.list.unnumbered' = { } # Bullet point list. -'markup.bold' = { fg = "orange" } # Bold text. - # bold text isn't so easy to read.. but purple bold works pretty well alongside purple-pleasant - # this orange is surprisingly dim! not bad at all, and keeps a consistent two-color theme -'markup.italic' = { modifiers = ["italic"] } # Italicised text. - 'markup.link' = { modifiers = ["underline"] } # different color is annoying in comments -# 'markup.link.url' = { } # Urls pointed to by links. -# 'markup.link.label' = { } # Non-URL link references. -# 'markup.link.text' = { fg = "purple-pleasant"} # URL and image descriptions in links. + # seems to underline only when highlighted, which is great!! +'markup.link.url' = { fg = "gray-stone"} # Urls pointed to by links. +'markup.link.label' = { fg = "gray-stone" } # Non-URL link references. +'markup.link.text' = { fg = "purple-pleasant"} # URL and image descriptions in links. -'markup.quote' = { fg = "gray-stone" } # `> Quotes` in Markdown. +'markup.quote' = { fg = "pink", modifiers = ["italic"] } # `> Quotes` in Markdown. + +# 'markup.raw' # TODO: ?? # Markup - Interface ============================== @@ -309,12 +332,14 @@ purple-selection-solid = "#29263c" green-aqua = "#54c59f" # used for constants/literals, not the prettiest, but it fits the aqua sea feelin' of the overall theme.. maybe can try bogster's green orange-warning = "#c7a06f" # warning, like a dim hazard sign pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation at the moment.. +pink-lighter = "#cb90d1" # 1/7th shade lighter (whiter) +pink-hot = "#cc6cd6" # +25% saturation, nice 'n slight! green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable red-error = "#c55858" # error, looks great when blinking, like red flashing like underwater! white-stone = "#bdbdbd" # variable, has a dim tinge of dirty stone to it gray-stone = "#6d6d6d" # comment, similar to white, but desaturated/grayed out, now a sort of dirty blonde; i didn't like it at first, but then became amazing once dimmed!! # gray-stone-dimmed = "#6d6d6d80" # 80 = 50%, 40 = 25% -gray-stone-lighter = "#858585" # used for comments with the dim modifier; 9d9d9d dimmed seems slightly brighter than gray-stone undimmed.. 7d7d7d is out of the way, 858585 forces eyes to read it, vs 8d8d8d? +gray-stone-lighter = "#7d7d7d" # used for comments with the dim modifier; 9d9d9d dimmed seems slightly brighter than gray-stone undimmed.. 7d7d7d is out of the way, 858585 forces eyes to read it, vs 8d8d8d? # TODO: alpha doesn't seem to affect these, only dim works.. bg = "#15141b" # was "black" From 6aff5b52fbd5594f28f003732b4f2c16886aa76f Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sun, 29 Sep 2024 03:28:12 -0700 Subject: [PATCH 04/20] deprecate underline? update gray. details.. --- runtime/themes/aurara.toml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index e6151a13a..6e9d97515 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -20,6 +20,7 @@ # TODO: # maybe add a fallback for every table..? +# the orange used for functions is too bright, get a darker shade # figure out how to get alpha workin'.. # how does this differ from saturation? # get a dim color for var/let/mut keyword @@ -42,12 +43,12 @@ 'hint' = { fg = "cyan", modifiers = ["bold", "dim"] } # Code diagnostics hint in gutter (LSP). # ? Difference between info and hint ? -'diagnostic' = { modifiers = ["underlined"] } # Code diagnostics in editing area (LSP). +'diagnostic' = { underline = { style = "line" } } # Code diagnostics in editing area (LSP). 'diagnostic.unnecessary' = { modifiers = ["dim"] } # took this from default theme 'diagnostic.deprecated' = { modifiers = ["crossed_out"] } # took this from default theme 'diagnostic.error' = { underline = { style = "curl", color = "red-error" }, modifiers = ["bold", "slow_blink", "dim"] } -'diagnostic.hint' = { underline = { style = "line", color = "cyan" }, modifiers = ["bold", "dim"] } -'diagnostic.info' = { underline = { style = "line", color = "blue-aqua" }, modifiers = ["bold", "dim"] } +'diagnostic.hint' = { underline = { style = "line", color = "cyan" }, modifiers = ["bold", "dim", "slow_blink" ] } +'diagnostic.info' = { underline = { style = "line", color = "blue-aqua" }, modifiers = ["bold", "dim", "slow_blink" ] } # TODO: TEST: diagnostics, might need a new set of colors..! can use all neon colors here!! # UI ============================== @@ -62,7 +63,7 @@ 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. 'ui.text.info' = { fg = "pink", bg ="bg" } # Info popup contents (space mode menu). # NOTE: pink pops out, making it better than the comfy purple-pleasant here -'ui.text.inactive' = { fg = "gray-stone" } # i think used in autocomplete suggestion.. +'ui.text.inactive' = { fg = "gray-stone-lighter", modifiers = ["dim"] } # i think used in autocomplete suggestion.. # TODO: a little hard to see, but i like it better than white-stone and purple-darker.. 'ui.cursor' = { fg = "light-green-complement", bg = "light-green", modifiers = ["reversed", "bold" ] } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c). @@ -92,14 +93,15 @@ 'ui.virtual.indent-guide' = { fg = "marker13" } # Indentation guides. # 'ui.bufferline' = { fg = "red-error"} -# 'ui.bufferline.active' = { modifiers = ["underline"] } # doesn't work.. -# 'ui.bufferline.inactive' # also doesn't work.. - # using ui.statusline instead: +# 'ui.bufferline.active' = { underline = { style = "line" } } + # not so pretty.., and it extends past the text +# 'ui.bufferline.inactive' # doesn't work.. + # using ui.statusline as fallback instead: 'ui.statusline' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # Status line. and tab bar # NOTE: matches line numbers 'ui.statusline.inactive' = { fg = "gray-stone", bg = "bg-ui", modifiers = [] } # Status line in unfocused windows. - # TODO: too dim, likely inherited, but i don't know how to uninherit it.. + # seems very dim.., likely inherited, but i don't know how to uninherit it.., i do prefer it to be different from the text used for comments though.. so it's not bad.. "ui.statusline.normal" = { fg = "purple-pleasant" } "ui.statusline.insert" = { fg = "pink-salmon", modifiers = [] } @@ -175,7 +177,7 @@ # even purple-pleasant dimmed doesn't look bad.. # 'comment.line' = { } # Line comments, like this. # 'comment.block' = { } # Block comments, like /* this */ in some languages. -'comment.block.documentation' = { fg = "gray-stone", modifiers = ["italic"] } # Doc comments, e.g '///' in rust. +'comment.block.documentation' = { fg = "gray-stone-lighter", modifiers = ["dim", "italic"] } # Doc comments, e.g '///' in rust. # TODO: TEST: maybe okay to use italics here.. 'variable' = { fg = "white-stone" } # Variable names. @@ -185,7 +187,7 @@ # TODO: this would be really useful to differentiate.. white-sea-tinged isn't too bad.. # 'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions). # TODO: could use another color here.. -'variable.function' = { fg = "orange-brighter" } # ? ruby-like everything is an object..? +'variable.function' = { fg = "orange" } # ? ruby-like everything is an object..? # NOTE: variable.other = "pink" in aura ?? 'label' = { fg = "purple" } # Loop labels in rust. @@ -220,6 +222,7 @@ # top three are ordered from brightest to darkest 'function' = { fg = "orange-brighter"} + # TODO: too bright.. :/ but much of the beauty of the theme comes from this color... 'function.method' = { fg = "orange" } # Class / Struct methods. 'function.builtin' = { fg = "gold-dim" } # TODO: TEST: gold-dim and orange-warning TODO: try minimus's yellow-orange @@ -251,6 +254,8 @@ markup = "purple-pleasant" # fallback 'markup.heading' = { fg = "orange-brighter", modifiers = ["bold"] } # Markdown headings # TODO: gold vs orange-brighter, i really just like the bolded gold, but if it's too bright, orange-brighter is perfect +# NOTE: underline didn't bold, and looked wayyy too thin compared to the bold font.. + # underline = { style = "curl", modifiers = ["bold"] } # 'markup.heading.1' = { } # Markdown heading 1 color. # 'markup.heading.2' = { } # Markdown heading 2 color. # 'markup.heading.3' = { } # Markdown heading 3 color. @@ -265,7 +270,7 @@ markup = "purple-pleasant" # fallback 'markup.list.numbered' = { fg = "gold" } # Numbered list. # 'markup.list.unnumbered' = { } # Bullet point list. -'markup.link' = { modifiers = ["underline"] } +'markup.link' = { underline = { style = "curl", modifiers = ["bold"] } } # different color is annoying in comments # seems to underline only when highlighted, which is great!! 'markup.link.url' = { fg = "gray-stone"} # Urls pointed to by links. @@ -332,7 +337,7 @@ purple-selection-solid = "#29263c" green-aqua = "#54c59f" # used for constants/literals, not the prettiest, but it fits the aqua sea feelin' of the overall theme.. maybe can try bogster's green orange-warning = "#c7a06f" # warning, like a dim hazard sign pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation at the moment.. -pink-lighter = "#cb90d1" # 1/7th shade lighter (whiter) +# pink-lighter = "#cb90d1" # 1/7th shade lighter (whiter) pink-hot = "#cc6cd6" # +25% saturation, nice 'n slight! green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable red-error = "#c55858" # error, looks great when blinking, like red flashing like underwater! From f38561a719e09631217a74915d176f11ce94e217 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sun, 29 Sep 2024 03:56:03 -0700 Subject: [PATCH 05/20] markup headings --- runtime/themes/aurara.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 6e9d97515..903d3d77e 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -256,12 +256,12 @@ markup = "purple-pleasant" # fallback # TODO: gold vs orange-brighter, i really just like the bolded gold, but if it's too bright, orange-brighter is perfect # NOTE: underline didn't bold, and looked wayyy too thin compared to the bold font.. # underline = { style = "curl", modifiers = ["bold"] } -# 'markup.heading.1' = { } # Markdown heading 1 color. -# 'markup.heading.2' = { } # Markdown heading 2 color. -# 'markup.heading.3' = { } # Markdown heading 3 color. -# 'markup.heading.4' = { } # Markdown heading 4 color. -# 'markup.heading.5' = { } # Markdown heading 5 color. -# 'markup.heading.6' = { } # Markdown heading 6 color. +'markup.heading.1' = { fg = "orange-brighter", modifiers = ["bold"] } +'markup.heading.2' = { fg = "orange", modifiers = ["bold"] } +'markup.heading.3' = { fg = "gold" } +'markup.heading.4' = { fg = "orange-brighter" } +'markup.heading.5' = { fg = "orange" } +'markup.heading.6' = { fg = "gold-dim" } 'markup.heading.marker' = { fg = "gold" } # Hashtag color on Markdown headings. # bolded gold is too distracting.. From 8a0416510d26964f2448e9f58ca4da0d9e331f43 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sun, 29 Sep 2024 05:30:12 -0700 Subject: [PATCH 06/20] no italics for namespaces, yes to html tags --- runtime/themes/aurara.toml | 46 ++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 903d3d77e..33089d7e7 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -20,11 +20,13 @@ # TODO: # maybe add a fallback for every table..? -# the orange used for functions is too bright, get a darker shade +# the orange used for functions is slightly too bright, get a darker shade +# find a different color for built-in types, currently using aura's default green-sea # figure out how to get alpha workin'.. # how does this differ from saturation? -# get a dim color for var/let/mut keyword +# get a different shade or color for var/let/mut general keywords?.. # currently using the same purple as operators.. which isn't too bad though, as it keeps a consistent scheme.. and it doesn't conflict with anything either. it's also good as a fallback for 'end', as that sometimes doesn't highlight properly.. + # also, when it's bolded, it becomes a different shade of purple, a brighter one, which is exactly what i wanted # NOTE: # struct counts as a keyword, not a type, which can be confusing.. maybe there's more keyword properties..?? @@ -132,13 +134,17 @@ 'property' = { fg = "green-aqua" } # Regex group names. # TODO: no clue.. never seen this.. just matching regex strings for now.. -'special' = { fg = "gold", modifiers = ["bold"] } # Special symbols e.g `?` in Rust, `...` in Hare. -'attribute' = { fg = "purple" } # Class attributes, html tag attributes. +'special' = { fg = "gold", modifiers = ["bold"] } # Special symbols e.g `?` in Rust, `...` in Hare, derive macro in rust?.. TODO: it seems to be used for the fuzzy-matching in pickers.. + # gold looks incredible for fuzzy-matching + # it's usually squashed between punctuation ()?; pink-hotter works well for this case.. + # pink-hotter vs orange-brighter or another color?.. +'attribute' = { fg = "purple", modifiers = ["italic"] } # Class attributes, html tag attributes. + # italics makes sense for html tag attributes.. matching tag 'type' = { fg = "blue-aqua" } # Variable type, like integer or string, including program defined classes, structs etc.. # NOTE: sometimes there's class / end, which looks odd not bolded like other control/end statements 'type.builtin' = { fg = "green-sea" } # Primitive types of the language (string, int, float). - # dark-blue was just too ugly.. this is still a funky sea green.. TODO: this is still a funky sea green.. + # blue-dark was just too ugly.. this is still a funky sea green.. TODO: this is still a funky sea green.. 'type.enum.variant' = { fg = "green-sea" } # A variant of an enum. # NOTE: i think was pink in aura theme.. but i def didn't like that for the enum values TODO: maybe white is fine @@ -154,7 +160,7 @@ # 'constant.character' = { fg = "blue-aqua"} # Constant of character type. # 'constant.character.escape' = { fg = "mid-green", modifiers = ["bold"] } # escape codes like \n. # NOTE: matches regexp -# 'constant.numeric' = { fg = "dark-blue", modifiers = ["bold"] } # constant integer or float value. +# 'constant.numeric' = { fg = "blue-dark", modifiers = ["bold"] } # constant integer or float value. # 'constant.numeric.integer' = { } # constant integer value. # 'constant.numeric.float' = { fg = "green-aqua" } # constant float value. @@ -202,18 +208,19 @@ 'keyword' = { fg = "purple" } # Language reserved keywords. var, void, struct, let, mut, was accent18 TODO: try it # TODO: could use another color here.. something that doesn't stick out.. snazzy's yellow is too bright (and dim too dim), maybe a purple-dark with less alpha..? 'keyword.control' = { fg = "purple", modifiers = ["bold"] } # Control keywords. + # NOTE: bold makes it slightly brighter too 'keyword.control.conditional' = { fg = "purple", modifiers = ["bold"] } # 'if', 'else', 'elif'. # TODO: could use a cascading shades of purple here, between purple and purple-darker of operator, darkest on the outside, yet it's also nice to have it consistent.. # 'keyword.control.repeat' = { } # 'for', 'while', 'loop'. -'keyword.control.import' = { fg = "orange", modifiers = ["italic", "bold"] } # 'import', 'export' ('use'?). +'keyword.control.import' = { fg = "orange", modifiers = ["italic", "bold"] } # 'import', 'export', 'use', 'mod' 'keyword.control.return' = { fg = "pink-salmon", modifiers = ["italic"] } # 'return' in most languages. - # NOTE: tried red, but it's so ugly!!.. :/ but could use it's own color.. stole noctis's pink-salmon here.. bold is really nice too, more pink-salmony, but it eventually bugged me..; italics makes it feel like it's *pressed* in + # NOTE: tried red-error, but it's so ugly!!.. :/ but could use it's own color.. stole noctis's pink-salmon here.. bold is really nice too, more pink-salmony, but it eventually bugged me..; italics makes it feel like it's *pressed* in 'keyword.control.exception' = { fg = "pink-salmon", modifiers = ["italic"] } # 'raise' in python. 'keyword.operator' = { fg = "purple-darker", modifiers = ["bold"] } # 'or', 'and', 'in'. # TODO: doesn't look like it's working..?? 'keyword.directive' = { fg = "purple", modifiers = ["italic"] } # Preprocessor directives (#if, #include in C). 'keyword.function' = { fg = "purple", modifiers = ["bold"] } # The keyword to define a funtion: 'def', 'fun', 'fn'. -'keyword.storage' = { fg = "purple" } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? var?? namespace?.. lots!! +'keyword.storage' = { fg = "purple" } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? var?? namespace?.. lots!! TODO: maybe there's more properties here.. # only makes sense to bold in C#.. # NOTE: struct and var should match type.builtin @@ -227,16 +234,18 @@ 'function.builtin' = { fg = "gold-dim" } # TODO: TEST: gold-dim and orange-warning TODO: try minimus's yellow-orange 'function.macro' = { fg = "gold", modifiers = ["italic"] } # Like macros in rust. + # italics here makes sense.. as does the magical gold of macros 'function.special' = { fg = "orange-brighter", modifiers = ["italic"] } # Preprocessor in C. # package, import -'tag' = { fg = "purple-darker" } # As in for html. - # must be darker then the default text +'tag' = { fg = "purple-darker", modifiers = ["italic"] } # As in for html. + # must be darker then the default text, and attribute -'namespace' = { fg = "dark-blue", modifiers = ["italic"] } # * Namespace keyword in java, C#, etc. +'namespace' = { fg = "blue-dark" } # * Namespace keyword in java, C#, etc. # namespace::function, namespace::class, package main, *types.Tuple # requires a seperate color - # TODO: this nasty dark-blue accurately matches how i feel about namespace syntax..: *barf*.. + # TODO: this nasty blue-dark accurately matches how i feel about namespace syntax..: *barf*.. pink-hotter is interesting... really changes things up!.. but i still prefer something similar to blue for logical reasoning + # for a long time i was using italics here, but then discovered it was part of its ugliness! now it's actually tolerable..! # Markup ============================== # Colors for markup languages, like Markdown or XML. also affects comments!! @@ -248,7 +257,7 @@ markup = "purple-pleasant" # fallback 'markup.bold' = { fg = "orange" } # Bold text. # bold text isn't so easy to read.. but purple bold works pretty well alongside purple-pleasant - # this orange is surprisingly dim! not bad at all, and keeps a consistent two-color theme + # this orange is surprisingly dim! not bad at all, and keeps a consistent two-color theme. though, orange-brighter is far more beautiful, but perhaps too bright.. 'markup.italic' = { modifiers = ["italic"] } # Italicised text. "markup.strikethrough" = { modifiers = ["crossed_out"] } @@ -279,12 +288,10 @@ markup = "purple-pleasant" # fallback 'markup.quote' = { fg = "pink", modifiers = ["italic"] } # `> Quotes` in Markdown. -# 'markup.raw' # TODO: ?? - - # Markup - Interface ============================== # "These scopes are used for theming the editor interface." +# TODO: ?? 'markup.normal' = { } 'markup.normal.completion' = { } # For completion doc popup ui. 'markup.normal.raw' = { } # For hover popup ui. @@ -325,7 +332,7 @@ orange = "#e4b782" # looks fantastic in noctics, fit for the sea theme, like a c green-dark = "#5b858b" # mainly for comments/background text, was "gray" red = "#e34e1b" -dark-blue = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. +blue-dark = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. blue-aqua = "#47ace8" # currently used for types, a pretty standard blue for classes.. cyan = "#87efff" # a tad bit too bright.. @@ -338,7 +345,8 @@ green-aqua = "#54c59f" # used for constants/literals, not the prettiest, but it orange-warning = "#c7a06f" # warning, like a dim hazard sign pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation at the moment.. # pink-lighter = "#cb90d1" # 1/7th shade lighter (whiter) -pink-hot = "#cc6cd6" # +25% saturation, nice 'n slight! +pink-hot = "#cc6cd6" # +25% saturation, nice 'n slight! for delimiters +pink-hotter = "#d85ee3" # +50% saturation, for "special" symbols green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable red-error = "#c55858" # error, looks great when blinking, like red flashing like underwater! white-stone = "#bdbdbd" # variable, has a dim tinge of dirty stone to it From b42ab35aba1c3411cf30009c24c7e950e2fbc8cd Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sun, 29 Sep 2024 06:02:00 -0700 Subject: [PATCH 07/20] italicize a bunch of keywords --- runtime/themes/aurara.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 33089d7e7..88ff2f021 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -22,6 +22,7 @@ # maybe add a fallback for every table..? # the orange used for functions is slightly too bright, get a darker shade # find a different color for built-in types, currently using aura's default green-sea +# keyword.storage has wayyyy too many keywords categorized in there.. surely theres some sub-categories in there.. # figure out how to get alpha workin'.. # how does this differ from saturation? # get a different shade or color for var/let/mut general keywords?.. @@ -220,7 +221,7 @@ # TODO: doesn't look like it's working..?? 'keyword.directive' = { fg = "purple", modifiers = ["italic"] } # Preprocessor directives (#if, #include in C). 'keyword.function' = { fg = "purple", modifiers = ["bold"] } # The keyword to define a funtion: 'def', 'fun', 'fn'. -'keyword.storage' = { fg = "purple" } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? var?? namespace?.. lots!! TODO: maybe there's more properties here.. +'keyword.storage' = { fg = "purple", modifiers = ["italic"] } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? var?? namespace?; also let, mut.. lots!! TODO: maybe there's more properties in here..?? # only makes sense to bold in C#.. # NOTE: struct and var should match type.builtin From cceede529103f921b8c12c6d4b16272a35450673 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sun, 29 Sep 2024 07:05:39 -0700 Subject: [PATCH 08/20] reduce brightness of orange --- runtime/themes/aurara.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 88ff2f021..163bc0102 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -229,8 +229,8 @@ 'operator' = { fg = "purple-darker", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators # top three are ordered from brightest to darkest -'function' = { fg = "orange-brighter"} - # TODO: too bright.. :/ but much of the beauty of the theme comes from this color... +'function' = { fg = "orange"} + # TODO: orange-brighter is too bright.. :/ but much of the beauty of the theme comes from this color... just need to get a notch lower.. 'function.method' = { fg = "orange" } # Class / Struct methods. 'function.builtin' = { fg = "gold-dim" } # TODO: TEST: gold-dim and orange-warning TODO: try minimus's yellow-orange From 8451051a05dee2f8446d676765c92dff10a51121 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Sun, 29 Sep 2024 07:06:19 -0700 Subject: [PATCH 09/20] try pink for variable.other --- runtime/themes/aurara.toml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 163bc0102..566f0b262 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -21,6 +21,7 @@ # TODO: # maybe add a fallback for every table..? # the orange used for functions is slightly too bright, get a darker shade +# create a white-stone with a tinge of color for variable.other # find a different color for built-in types, currently using aura's default green-sea # keyword.storage has wayyyy too many keywords categorized in there.. surely theres some sub-categories in there.. # figure out how to get alpha workin'.. @@ -192,18 +193,18 @@ # NOTE: matches class color 'variable.parameter' = { fg = "white-stone" } # Function parameters. # TODO: this would be really useful to differentiate.. white-sea-tinged isn't too bad.. -# 'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions). - # TODO: could use another color here.. 'variable.function' = { fg = "orange" } # ? ruby-like everything is an object..? -# NOTE: variable.other = "pink" in aura ?? +'variable.other' = {fg = "pink" } # from aura.. + # TODO: decide white-stone vs pink vs another color, and remember to turn down punctuation down a notch in hotness; would be nice to create a slightly tinged color, like noctis's white-sea-tinge +# 'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions). 'label' = { fg = "purple" } # Loop labels in rust. -'punctuation' = { fg = "pink", modifiers = ["bold"] } # (){}[]:;,. +'punctuation' = { fg = "pink-hot", modifiers = ["bold"] } # (){}[]:;,. # NOTE: the bolded gold from noctic is really, really nice, but it collides with the orange-brighter color; also, bolded white is too much white, should save white just for variables only -'punctuation.delimiter' = { fg = "pink-hot", modifiers = ["bold"] } # Commas and colons. +'punctuation.delimiter' = { fg = "pink-hotter", modifiers = ["bold"] } # Commas and colons. # TODO: TEST: i might just prefer the same pink for consistency.. though this is very very slight..! -'punctuation.bracket' = { fg = "pink", modifiers = ["bold"] } # Parentheses, angle brackets, etc. +'punctuation.bracket' = { fg = "pink-hot", modifiers = ["bold"] } # Parentheses, angle brackets, etc. 'punctuation.special' = { fg = "gold", modifiers = ["bold"] } # no clue.. 'keyword' = { fg = "purple" } # Language reserved keywords. var, void, struct, let, mut, was accent18 TODO: try it @@ -221,8 +222,8 @@ # TODO: doesn't look like it's working..?? 'keyword.directive' = { fg = "purple", modifiers = ["italic"] } # Preprocessor directives (#if, #include in C). 'keyword.function' = { fg = "purple", modifiers = ["bold"] } # The keyword to define a funtion: 'def', 'fun', 'fn'. -'keyword.storage' = { fg = "purple", modifiers = ["italic"] } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? var?? namespace?; also let, mut.. lots!! TODO: maybe there's more properties in here..?? - # only makes sense to bold in C#.. +'keyword.storage' = { fg = "purple", modifiers = ["italic"] } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? enum? var?? namespace?; also let, mut.. lots!! TODO: maybe there's more properties in here..?? + # only makes sense to bold in C#.. italics seems better fit for most languages, especially rust # NOTE: struct and var should match type.builtin From 6cdabf0343f85d495369e1139f9fc224885ae079 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Mon, 30 Sep 2024 01:49:10 -0700 Subject: [PATCH 10/20] dim pink 'n purple also found keyword.storage.modifier and keyword.storage.type --- runtime/themes/aurara.toml | 82 ++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 566f0b262..d5218f7fa 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -20,10 +20,13 @@ # TODO: # maybe add a fallback for every table..? -# the orange used for functions is slightly too bright, get a darker shade +# currently trying a dimmer shade of pink for variable-other, but there's too many keywords categorized in there.. +# currently trying a dimmer shade for keyword.storage.modifier.. +# find out where the color for file picker is set, and try to dim it + # i tried searching the other configs in the repo to no avail, just found ui.picker.header +# oranger-brighter used for functions is slightly too bright, get a darker shade (using orange for now..) # create a white-stone with a tinge of color for variable.other # find a different color for built-in types, currently using aura's default green-sea -# keyword.storage has wayyyy too many keywords categorized in there.. surely theres some sub-categories in there.. # figure out how to get alpha workin'.. # how does this differ from saturation? # get a different shade or color for var/let/mut general keywords?.. @@ -58,15 +61,17 @@ # UI ============================== # For styling helix itself. -'ui.background' = { fg = "purple-pleasant", bg = "bg"} # Default background color., the fg seems to be used for borders.. -'ui.window' = { fg = "purple-pleasant" } # Window border between splits. +'ui.background' = { fg = "purple-pleasant-dimmer", bg = "bg"} # Default background color., the fg seems to be used for borders.. +'ui.window' = { fg = "gray-stone" } # Window border between splits. + # pruple also works really well here.. maybe more needed when there are no line numbers.. 'ui.gutter' = { fg = "orange-warning"} # Left gutter for diagnostics and breakpoints. -'ui.text' = { fg = "purple-pleasant" } # Default text color. used in text files, pickers, ui, and more! +'ui.text' = { fg = "purple-pleasant-dimmer" } # Default text color. used in text files, pickers, ui, and more! 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. -'ui.text.info' = { fg = "pink", bg ="bg" } # Info popup contents (space mode menu). - # NOTE: pink pops out, making it better than the comfy purple-pleasant here +'ui.text.info' = { fg = "pink-even-dimmer", bg ="bg" } # Info popup contents (space mode menu). + # see ui.menu for auto-complete + # NOTE: pink pops out more, making it better than the comfy purple-pleasant-dimmer here 'ui.text.inactive' = { fg = "gray-stone-lighter", modifiers = ["dim"] } # i think used in autocomplete suggestion.. # TODO: a little hard to see, but i like it better than white-stone and purple-darker.. @@ -119,16 +124,20 @@ 'ui.highlight' = { bg = "selection-ui", modifiers = ["slow_blink"] } # selected contents of symbol pickers (spc-s, spc-S) and current line in buffer picker (spc-b). -'ui.menu' = { fg = "pink", bg = "bg" } # Autocomplete menu. - # pink is a nice change from purple-pleasant.. +'ui.menu' = { fg = "purple-pleasant", bg = "bg", modifiers = ["dim"] } # Autocomplete menu. + # a dim color that doesn't pop up makes sense here + # BUG: the dim modifier conflicts with the matching gold for the first line only 'ui.menu.selected' = { bg = "selection-ui", fg = "gold", modifiers = ["bold"] } # Selected autocomplete item. # not a fan of slow_blink here.. # gold is fantastic for selected text and fuzzy matching -'ui.popup' = { fg = "purple-pleasant", bg = "bg" } # Documentation popups (space-k). -'ui.popup.info' = { fg = "pink", bg = "bg" } # Info popups box (space mode menu). - # bold was just too much.. the pink is nice tho! vs purple-pleasant - # it seems ui.text.info overrides this..?? +# 'ui.picker' = { fg = "purple" } # ope.. good guess.. +"ui.picker.header" = { modifiers = ["bold"] } # TODO: TEST: i found this in another config, no clue yet.. + +'ui.popup' = { fg = "purple-pleasant-dimmer", bg = "bg" } # Documentation popups (space-k). +'ui.popup.info' = { fg = "purple", bg = "bg" } # Info popups box (space mode menu). just the borders. + # gold is very pretty here.., but distracting.. purple creates a solid frame and feels out of the way.. + # modifiers don't work here.. no shiny blinky stuff..; also dim doesn't work, so can't use purple-pleasant dimmed.. # "ui.menu.scroll" = { } # SYNTAX HIGHLIGHTING ============================== @@ -145,9 +154,11 @@ 'type' = { fg = "blue-aqua" } # Variable type, like integer or string, including program defined classes, structs etc.. # NOTE: sometimes there's class / end, which looks odd not bolded like other control/end statements -'type.builtin' = { fg = "green-sea" } # Primitive types of the language (string, int, float). + # doesn't seperate declaration, parameters, instantiation (though there is constructor), so it's difficult to italicize +'type.builtin' = { fg = "green-sea", modifiers = ["italic"] } # Primitive types of the language (string, int, float). # blue-dark was just too ugly.. this is still a funky sea green.. TODO: this is still a funky sea green.. 'type.enum.variant' = { fg = "green-sea" } # A variant of an enum. + # vs match constant color # NOTE: i think was pink in aura theme.. but i def didn't like that for the enum values TODO: maybe white is fine 'constructor' = { fg = "blue-aqua" } # Constructor method for a class or struct. And in some cases applies to module names, as in ruby @@ -166,11 +177,11 @@ # 'constant.numeric.integer' = { } # constant integer value. # 'constant.numeric.float' = { fg = "green-aqua" } # constant float value. -'string' = { fg = "purple-pleasant" } # String literal. +'string' = { fg = "purple-pleasant-dimmer" } # String literal. # changed to use main text color (purple!) TODO: can decrease alpha more if needed 'string.regexp' = { fg = "green-aqua" } # Regular expression literal. # NOTE: matches character escape -'string.special' = { fg = "purple-pleasant", modifiers = ["italic"] } # Strings containing a path, URL, etc. +'string.special' = { fg = "purple-pleasant-dimmer", modifiers = ["italic"] } # Strings containing a path, URL, etc. # could use something funky 'n dark here.. # i hate long underlined text!, so def don't want that.. # TODO: TEST: italics @@ -189,22 +200,24 @@ # TODO: TEST: maybe okay to use italics here.. 'variable' = { fg = "white-stone" } # Variable names. + # likely the most important word in the line, and therefore must be the most easily visible, yet comfortable 'variable.builtin' = { fg = "blue-aqua" } # Language reserved variables: `this`, `self`, `super`, etc. # NOTE: matches class color 'variable.parameter' = { fg = "white-stone" } # Function parameters. # TODO: this would be really useful to differentiate.. white-sea-tinged isn't too bad.. 'variable.function' = { fg = "orange" } # ? ruby-like everything is an object..? -'variable.other' = {fg = "pink" } # from aura.. +'variable.other' = { fg = "white-stone" } # from aura.. + # fallback +'variable.other.member' = { fg = "pink-dimmer" } # Fields of composite data types (e.g. structs, unions). # TODO: decide white-stone vs pink vs another color, and remember to turn down punctuation down a notch in hotness; would be nice to create a slightly tinged color, like noctis's white-sea-tinge -# 'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions). 'label' = { fg = "purple" } # Loop labels in rust. -'punctuation' = { fg = "pink-hot", modifiers = ["bold"] } # (){}[]:;,. +'punctuation' = { fg = "pink", modifiers = ["bold"] } # (){}[]:;,. # NOTE: the bolded gold from noctic is really, really nice, but it collides with the orange-brighter color; also, bolded white is too much white, should save white just for variables only -'punctuation.delimiter' = { fg = "pink-hotter", modifiers = ["bold"] } # Commas and colons. - # TODO: TEST: i might just prefer the same pink for consistency.. though this is very very slight..! -'punctuation.bracket' = { fg = "pink-hot", modifiers = ["bold"] } # Parentheses, angle brackets, etc. +'punctuation.delimiter' = { fg = "pink-hot", modifiers = ["bold"] } # Commas and colons. + # pink-hotter is slightly too annoying.. +'punctuation.bracket' = { fg = "pink", modifiers = ["bold"] } # Parentheses, angle brackets, etc. 'punctuation.special' = { fg = "gold", modifiers = ["bold"] } # no clue.. 'keyword' = { fg = "purple" } # Language reserved keywords. var, void, struct, let, mut, was accent18 TODO: try it @@ -222,9 +235,12 @@ # TODO: doesn't look like it's working..?? 'keyword.directive' = { fg = "purple", modifiers = ["italic"] } # Preprocessor directives (#if, #include in C). 'keyword.function' = { fg = "purple", modifiers = ["bold"] } # The keyword to define a funtion: 'def', 'fun', 'fn'. -'keyword.storage' = { fg = "purple", modifiers = ["italic"] } # function and type modifiers/accessors: public/private, internal, readonly, const, etc.; also struct? enum? var?? namespace?; also let, mut.. lots!! TODO: maybe there's more properties in here..?? - # only makes sense to bold in C#.. italics seems better fit for most languages, especially rust - # NOTE: struct and var should match type.builtin +'keyword.storage' = { fg = "purple" } # let and var in rust.. these should be more visible.. i tried defualt's almond, but it was just too bright.. +'keyword.storage.modifier' = { fg = "purple-dimmer", modifiers = ["italic"] } # function and type modifiers/accessors: public/private, mut, dyn, ref, &, internal, readonly, const, etc. + # these should be less visible + # bold makes sense here for C#, as it's usually the start of a function, but not so much for rust.. +'keyword.storage.type' = { fg = "green-sea", modifiers = ["italic"] } # class, struct, enum, namespace, sometimes var? (for javascript but not rust) + # matches type.builtin 'operator' = { fg = "purple-darker", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators @@ -255,7 +271,7 @@ # a little different from code since it's so simple, using a simple two color scheme: purple 'n gold # NOTE: it inherits the main text color from ui.text, and punctuation too -markup = "purple-pleasant" # fallback +markup = "purple-pleasant-dimmer" # fallback 'markup.bold' = { fg = "orange" } # Bold text. # bold text isn't so easy to read.. but purple bold works pretty well alongside purple-pleasant @@ -286,7 +302,7 @@ markup = "purple-pleasant" # fallback # seems to underline only when highlighted, which is great!! 'markup.link.url' = { fg = "gray-stone"} # Urls pointed to by links. 'markup.link.label' = { fg = "gray-stone" } # Non-URL link references. -'markup.link.text' = { fg = "purple-pleasant"} # URL and image descriptions in links. +'markup.link.text' = { fg = "purple-pleasant-dimmer"} # URL and image descriptions in links. 'markup.quote' = { fg = "pink", modifiers = ["italic"] } # `> Quotes` in Markdown. @@ -336,18 +352,24 @@ red = "#e34e1b" blue-dark = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. blue-aqua = "#47ace8" # currently used for types, a pretty standard blue for classes.. -cyan = "#87efff" # a tad bit too bright.. +cyan = "#87efff" # a tadtoo bright.. # aura dark soft/dim purple = "#8464c6" +purple-dimmer = "#705AA2" # via radix.ui.com purple-selection = "#3d375e7f" purple-selection-solid = "#29263c" green-aqua = "#54c59f" # used for constants/literals, not the prettiest, but it fits the aqua sea feelin' of the overall theme.. maybe can try bogster's green orange-warning = "#c7a06f" # warning, like a dim hazard sign pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation at the moment.. # pink-lighter = "#cb90d1" # 1/7th shade lighter (whiter) -pink-hot = "#cc6cd6" # +25% saturation, nice 'n slight! for delimiters +# white-stone-pink = "#BEA7C1" # somewhere between white-stone and pink; meh... pink is just more clearly visible than the colors between.. +# pink-brighter = "#DE95E5" +pink-dimmer = "#B56EBC" # slightly desaturated, used for fields/methods and elixir's @thing +# fuschia = "#A955B2" # TODO: an interesting one to use.. +pink-even-dimmer = "#8C5C90" # used for pop-up menus, similar to pink with dim modifier TODO: maybe too dim.. +pink-hot = "#cc6cd6" # +25% saturation, nice 'n slight! for delimiters via coolers.co gradient pink-hotter = "#d85ee3" # +50% saturation, for "special" symbols green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable red-error = "#c55858" # error, looks great when blinking, like red flashing like underwater! @@ -360,6 +382,8 @@ bg = "#15141b" # was "black" orange-brighter = "#ffca85" # brighter than noctis's orange purple-pleasant = "#a394f033" # great comfy purp for ui, should be main color, used for text (in .txt files) and strings and ui, was accent17 + # NOTE: still use this with dim modifer to make a color even dimmer than purple-pleasant-dimmer +purple-pleasant-dimmer = "#9889E4" # switch to using this as main text.. along with pink-dimmer # aura colors shared between variations # text10 = "#adacae" # TODO: try it From ca298301a82063f18a8f95d480da50f40aca9940 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Mon, 30 Sep 2024 02:01:53 -0700 Subject: [PATCH 11/20] refactoring woes --- runtime/themes/aurara.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index d5218f7fa..2648de8eb 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -120,7 +120,7 @@ # slow_blink on insert/select was too annoying.. # using a colored background was also too annoying -'ui.help' = { bg = "bg", fg = "pink"} # `:command` descriptions above the command line. +'ui.help' = { bg = "bg", fg = "pink-even-dimmer"} # `:command` descriptions above the command line. 'ui.highlight' = { bg = "selection-ui", modifiers = ["slow_blink"] } # selected contents of symbol pickers (spc-s, spc-S) and current line in buffer picker (spc-b). @@ -304,7 +304,7 @@ markup = "purple-pleasant-dimmer" # fallback 'markup.link.label' = { fg = "gray-stone" } # Non-URL link references. 'markup.link.text' = { fg = "purple-pleasant-dimmer"} # URL and image descriptions in links. -'markup.quote' = { fg = "pink", modifiers = ["italic"] } # `> Quotes` in Markdown. +'markup.quote' = { fg = "pink-dimmer", modifiers = ["italic"] } # `> Quotes` in Markdown. # Markup - Interface ============================== # "These scopes are used for theming the editor interface." From 2ca70789297fe73e3722dc989ad9dcb4f046ce76 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Mon, 30 Sep 2024 23:02:42 -0700 Subject: [PATCH 12/20] brighten ui pink --- runtime/themes/aurara.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 2648de8eb..bd3fe8a7a 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -20,7 +20,7 @@ # TODO: # maybe add a fallback for every table..? -# currently trying a dimmer shade of pink for variable-other, but there's too many keywords categorized in there.. +# currently trying a dimmer shade of pink for variable-other and ui-popup menus, but there's too many keywords categorized in there.. # currently trying a dimmer shade for keyword.storage.modifier.. # find out where the color for file picker is set, and try to dim it # i tried searching the other configs in the repo to no avail, just found ui.picker.header @@ -69,7 +69,7 @@ 'ui.text' = { fg = "purple-pleasant-dimmer" } # Default text color. used in text files, pickers, ui, and more! 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. -'ui.text.info' = { fg = "pink-even-dimmer", bg ="bg" } # Info popup contents (space mode menu). +'ui.text.info' = { fg = "pink-dimmer", bg ="bg" } # Info popup contents (space mode menu). # see ui.menu for auto-complete # NOTE: pink pops out more, making it better than the comfy purple-pleasant-dimmer here 'ui.text.inactive' = { fg = "gray-stone-lighter", modifiers = ["dim"] } # i think used in autocomplete suggestion.. @@ -120,7 +120,7 @@ # slow_blink on insert/select was too annoying.. # using a colored background was also too annoying -'ui.help' = { bg = "bg", fg = "pink-even-dimmer"} # `:command` descriptions above the command line. +'ui.help' = { bg = "bg", fg = "pink-dimmer"} # `:command` descriptions above the command line. 'ui.highlight' = { bg = "selection-ui", modifiers = ["slow_blink"] } # selected contents of symbol pickers (spc-s, spc-S) and current line in buffer picker (spc-b). @@ -368,7 +368,7 @@ pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be se # pink-brighter = "#DE95E5" pink-dimmer = "#B56EBC" # slightly desaturated, used for fields/methods and elixir's @thing # fuschia = "#A955B2" # TODO: an interesting one to use.. -pink-even-dimmer = "#8C5C90" # used for pop-up menus, similar to pink with dim modifier TODO: maybe too dim.. +# pink-even-dimmer = "#8C5C90" # used for pop-up menus, similar to pink with dim modifier.. too dim, not even pink anymore! more like magenta.. but very comfy to read! pink-hot = "#cc6cd6" # +25% saturation, nice 'n slight! for delimiters via coolers.co gradient pink-hotter = "#d85ee3" # +50% saturation, for "special" symbols green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable From 5cf2534030fc89a5e6daadb0d09e1d9f51abcd4b Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Tue, 1 Oct 2024 03:07:34 -0700 Subject: [PATCH 13/20] tweakin' colors --- runtime/themes/aurara.toml | 71 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index bd3fe8a7a..272fc1afc 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -20,18 +20,13 @@ # TODO: # maybe add a fallback for every table..? -# currently trying a dimmer shade of pink for variable-other and ui-popup menus, but there's too many keywords categorized in there.. -# currently trying a dimmer shade for keyword.storage.modifier.. +# still not happy about blue-green used for namespace, especially for rust.. +# currently trying a dimmer shade of pink for variable-other, but there's too many keywords categorized in there.. + # create a white-stone with a tinge of color for variable.other..? # find out where the color for file picker is set, and try to dim it # i tried searching the other configs in the repo to no avail, just found ui.picker.header # oranger-brighter used for functions is slightly too bright, get a darker shade (using orange for now..) -# create a white-stone with a tinge of color for variable.other # find a different color for built-in types, currently using aura's default green-sea -# figure out how to get alpha workin'.. - # how does this differ from saturation? -# get a different shade or color for var/let/mut general keywords?.. - # currently using the same purple as operators.. which isn't too bad though, as it keeps a consistent scheme.. and it doesn't conflict with anything either. it's also good as a fallback for 'end', as that sometimes doesn't highlight properly.. - # also, when it's bolded, it becomes a different shade of purple, a brighter one, which is exactly what i wanted # NOTE: # struct counts as a keyword, not a type, which can be confusing.. maybe there's more keyword properties..?? @@ -47,14 +42,14 @@ # but not ERROR..? 'info' = { fg = "blue-aqua" } # Code diagnostic info in gutter (LSP). TODO/INFO # def prefer noctis's blue-aqua over aura's here -'hint' = { fg = "cyan", modifiers = ["bold", "dim"] } # Code diagnostics hint in gutter (LSP). +'hint' = { fg = "cyan", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP). # ? Difference between info and hint ? 'diagnostic' = { underline = { style = "line" } } # Code diagnostics in editing area (LSP). 'diagnostic.unnecessary' = { modifiers = ["dim"] } # took this from default theme 'diagnostic.deprecated' = { modifiers = ["crossed_out"] } # took this from default theme 'diagnostic.error' = { underline = { style = "curl", color = "red-error" }, modifiers = ["bold", "slow_blink", "dim"] } -'diagnostic.hint' = { underline = { style = "line", color = "cyan" }, modifiers = ["bold", "dim", "slow_blink" ] } +'diagnostic.hint' = { underline = { style = "line", color = "cyan-bright" }, modifiers = ["bold", "dim", "slow_blink" ] } 'diagnostic.info' = { underline = { style = "line", color = "blue-aqua" }, modifiers = ["bold", "dim", "slow_blink" ] } # TODO: TEST: diagnostics, might need a new set of colors..! can use all neon colors here!! @@ -81,7 +76,7 @@ # TODO: NOTE: this blinking at a different timing then the selection's blink is too much!! lol, but i do prefer it to blink.. # 'ui.cursor.insert' = { fg = "pink", bg = "light-green", modifiers = ["reversed", "bold"] } # The cursor in insert mode (i). # 'ui.cursor.select' = { fg = "pink", bg = "light-green", modifiers = ["reversed", "bold"] } # The cursor in select mode (v). -'ui.cursor.match' = { fg = "cyan", bg = "pink", modifiers = ["bold", "reversed", "slow_blink"] } # The matching parentheses of that under the cursor. +'ui.cursor.match' = { fg = "cyan-bright", bg = "pink", modifiers = ["bold", "reversed", "slow_blink"] } # The matching parentheses of that under the cursor. # NOTE: changed from purple, which was a bit tough to see..; rapid_blink was just too annoying..; light-green was too much, trying cyan.. 'ui.selection' = { bg = "selection-ui", modifiers = [ "bold", "slow_blink" ] } # All currently selected text. @@ -145,10 +140,9 @@ 'property' = { fg = "green-aqua" } # Regex group names. # TODO: no clue.. never seen this.. just matching regex strings for now.. -'special' = { fg = "gold", modifiers = ["bold"] } # Special symbols e.g `?` in Rust, `...` in Hare, derive macro in rust?.. TODO: it seems to be used for the fuzzy-matching in pickers.. - # gold looks incredible for fuzzy-matching - # it's usually squashed between punctuation ()?; pink-hotter works well for this case.. - # pink-hotter vs orange-brighter or another color?.. +'special' = { fg = "gold", modifiers = ["bold"] } # Special symbols e.g `?` in Rust, `...` in Hare, also derive macro..?? BUG: also used for fuzzy search?? + # rust's ? is usually squashed between punctuation ()?; + # gold is too bright, but fantastic for fuzzy search. pink-hotter works well for punctuation. gold also works well for the derive macro. it's also nice for it to just stick out, so as to indicate a syntax highlighting problem 'attribute' = { fg = "purple", modifiers = ["italic"] } # Class attributes, html tag attributes. # italics makes sense for html tag attributes.. matching tag @@ -156,7 +150,6 @@ # NOTE: sometimes there's class / end, which looks odd not bolded like other control/end statements # doesn't seperate declaration, parameters, instantiation (though there is constructor), so it's difficult to italicize 'type.builtin' = { fg = "green-sea", modifiers = ["italic"] } # Primitive types of the language (string, int, float). - # blue-dark was just too ugly.. this is still a funky sea green.. TODO: this is still a funky sea green.. 'type.enum.variant' = { fg = "green-sea" } # A variant of an enum. # vs match constant color # NOTE: i think was pink in aura theme.. but i def didn't like that for the enum values TODO: maybe white is fine @@ -167,13 +160,13 @@ 'constant' = { fg = "green-aqua" } # Constant value # originally green in aura... and it seems a pretty good use of this green, as i don't use it for strings anymore.. - # NOTE: if this is too dark, can use light-green, as there aren't too many of these.. + # NOTE: if this is too dark, can use cyan or light-green, as there aren't too many of these.. # 'constant.builtin' = { fg = "blue-aqua" } # Special constants like `true`, `false`, `none`, etc. # 'constant.builtin.boolean' = { } # True or False. # 'constant.character' = { fg = "blue-aqua"} # Constant of character type. # 'constant.character.escape' = { fg = "mid-green", modifiers = ["bold"] } # escape codes like \n. # NOTE: matches regexp -# 'constant.numeric' = { fg = "blue-dark", modifiers = ["bold"] } # constant integer or float value. +# 'constant.numeric' = { fg = "blue-green", modifiers = ["bold"] } # constant integer or float value. # 'constant.numeric.integer' = { } # constant integer value. # 'constant.numeric.float' = { fg = "green-aqua" } # constant float value. @@ -188,7 +181,8 @@ # 'string.special.path' = { } # String containing a file path. # 'string.special.url' = { } # String containing a web URL. 'string.special.symbol' = { fg = "berry-desaturated" } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords. - # secondary text (pink) collides with punctuation :/ + # secondary text (pink) collides with punctuation :/, so now pink is used for variable.other + # perhaps it could be similar to the color used for constant/literals.. a kind of green..? 'comment' = { fg = "gray-stone-lighter", modifiers = ["dim"] } # This is a comment. # TODO: dim and italics should be optional @@ -204,7 +198,7 @@ 'variable.builtin' = { fg = "blue-aqua" } # Language reserved variables: `this`, `self`, `super`, etc. # NOTE: matches class color 'variable.parameter' = { fg = "white-stone" } # Function parameters. - # TODO: this would be really useful to differentiate.. white-sea-tinged isn't too bad.. + # TODO: this would be really useful to differentiate.. white-sea-tinged isn't too bad.. italic is too anooying 'variable.function' = { fg = "orange" } # ? ruby-like everything is an object..? 'variable.other' = { fg = "white-stone" } # from aura.. # fallback @@ -219,15 +213,16 @@ # pink-hotter is slightly too annoying.. 'punctuation.bracket' = { fg = "pink", modifiers = ["bold"] } # Parentheses, angle brackets, etc. 'punctuation.special' = { fg = "gold", modifiers = ["bold"] } # no clue.. + # use gold to make it stick out a little.. -'keyword' = { fg = "purple" } # Language reserved keywords. var, void, struct, let, mut, was accent18 TODO: try it - # TODO: could use another color here.. something that doesn't stick out.. snazzy's yellow is too bright (and dim too dim), maybe a purple-dark with less alpha..? +'keyword' = { fg = "purple" } # Language reserved keywords. var, void, let 'keyword.control' = { fg = "purple", modifiers = ["bold"] } # Control keywords. # NOTE: bold makes it slightly brighter too 'keyword.control.conditional' = { fg = "purple", modifiers = ["bold"] } # 'if', 'else', 'elif'. # TODO: could use a cascading shades of purple here, between purple and purple-darker of operator, darkest on the outside, yet it's also nice to have it consistent.. # 'keyword.control.repeat' = { } # 'for', 'while', 'loop'. 'keyword.control.import' = { fg = "orange", modifiers = ["italic", "bold"] } # 'import', 'export', 'use', 'mod' + # TODO: could use another color here.. 'keyword.control.return' = { fg = "pink-salmon", modifiers = ["italic"] } # 'return' in most languages. # NOTE: tried red-error, but it's so ugly!!.. :/ but could use it's own color.. stole noctis's pink-salmon here.. bold is really nice too, more pink-salmony, but it eventually bugged me..; italics makes it feel like it's *pressed* in 'keyword.control.exception' = { fg = "pink-salmon", modifiers = ["italic"] } # 'raise' in python. @@ -239,6 +234,7 @@ 'keyword.storage.modifier' = { fg = "purple-dimmer", modifiers = ["italic"] } # function and type modifiers/accessors: public/private, mut, dyn, ref, &, internal, readonly, const, etc. # these should be less visible # bold makes sense here for C#, as it's usually the start of a function, but not so much for rust.. + # currently using the same purple as operators.. which isn't too bad though, as it keeps a consistent scheme.. and it doesn't conflict with anything either. it's also good as a fallback for 'end', as that sometimes doesn't highlight properly.. 'keyword.storage.type' = { fg = "green-sea", modifiers = ["italic"] } # class, struct, enum, namespace, sometimes var? (for javascript but not rust) # matches type.builtin @@ -246,23 +242,22 @@ 'operator' = { fg = "purple-darker", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators # top three are ordered from brightest to darkest + # also used in markup headings 'function' = { fg = "orange"} # TODO: orange-brighter is too bright.. :/ but much of the beauty of the theme comes from this color... just need to get a notch lower.. -'function.method' = { fg = "orange" } # Class / Struct methods. +'function.method' = { fg = "orange-dimmer" } # Class / Struct methods. 'function.builtin' = { fg = "gold-dim" } - # TODO: TEST: gold-dim and orange-warning TODO: try minimus's yellow-orange -'function.macro' = { fg = "gold", modifiers = ["italic"] } # Like macros in rust. - # italics here makes sense.. as does the magical gold of macros -'function.special' = { fg = "orange-brighter", modifiers = ["italic"] } # Preprocessor in C. - # package, import +'function.macro' = { fg = "orange", modifiers = ["italic"] } # Like macros in rust. + # italics works well here.. as does the magical gold of macros, as does orange-pumpkin +'function.special' = { fg = "orange", modifiers = ["italic"] } # Preprocessor in C. 'tag' = { fg = "purple-darker", modifiers = ["italic"] } # As in for html. # must be darker then the default text, and attribute -'namespace' = { fg = "blue-dark" } # * Namespace keyword in java, C#, etc. +'namespace' = { fg = "blue-green" } # * Namespace keyword in java, C#, etc. # namespace::function, namespace::class, package main, *types.Tuple # requires a seperate color - # TODO: this nasty blue-dark accurately matches how i feel about namespace syntax..: *barf*.. pink-hotter is interesting... really changes things up!.. but i still prefer something similar to blue for logical reasoning + # TODO: this nasty blue-green accurately matches how i feel about namespace syntax..: *barf*.. pink-hotter is interesting... really changes things up!.. but i still prefer something similar to blue for logical reasoning # for a long time i was using italics here, but then discovered it was part of its ugliness! now it's actually tolerable..! # Markup ============================== @@ -347,19 +342,24 @@ gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", purple-darker = "#6f60ea" # this purple is slightly darker than aura's, used for cascading keywords, but seems to match vs-code's aura better?? white-sea-tinged = "#b1cace" # has a tinge of green in it.., pleasant tho orange = "#e4b782" # looks fantastic in noctics, fit for the sea theme, like a clown-fish, using it for functions +# orange-pumpkin = "#ff9e64" # orange from tokyonight, too bright but really orange! +orange-dimmer = "#e0af68" # yellow from tokyonight green-dark = "#5b858b" # mainly for comments/background text, was "gray" red = "#e34e1b" -blue-dark = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. -blue-aqua = "#47ace8" # currently used for types, a pretty standard blue for classes.. -cyan = "#87efff" # a tadtoo bright.. +blue-green = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. just feels too saturated. it's closest to tokyonight's aqua, but dimmer +# blue-green-desaturated = "#3B94A3" # hmmm, maybe desaturate isn't the answer.. just dims it.., but it's not a bad idea either.. +# blue-green = "#2C98BF" blue-green, with slightly lower hue, more greener +# blue-deep = "#3B8CFF" # a sort of standard blue, underwater deep blue, not bad for builtin types.. gives a different vibe.. +cyan-bright = "#87efff" # a tad too bright.. just used for cursor match # aura dark soft/dim purple = "#8464c6" -purple-dimmer = "#705AA2" # via radix.ui.com +purple-dimmer = "#7B57C2" # increased saturation?? purple-selection = "#3d375e7f" purple-selection-solid = "#29263c" +blue-aqua = "#47ace8" # currently used for types, a pretty standard blue for classes.. green-aqua = "#54c59f" # used for constants/literals, not the prettiest, but it fits the aqua sea feelin' of the overall theme.. maybe can try bogster's green orange-warning = "#c7a06f" # warning, like a dim hazard sign pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation at the moment.. @@ -374,6 +374,7 @@ pink-hotter = "#d85ee3" # +50% saturation, for "special" symbols green-sea = "#6cb2c7" # builtin type, a bit funky but very much readable red-error = "#c55858" # error, looks great when blinking, like red flashing like underwater! white-stone = "#bdbdbd" # variable, has a dim tinge of dirty stone to it +# white-stone-yellow-tinge = "#BAB195" # just added a little saturation, but it feels less readable :/ gray-stone = "#6d6d6d" # comment, similar to white, but desaturated/grayed out, now a sort of dirty blonde; i didn't like it at first, but then became amazing once dimmed!! # gray-stone-dimmed = "#6d6d6d80" # 80 = 50%, 40 = 25% gray-stone-lighter = "#7d7d7d" # used for comments with the dim modifier; 9d9d9d dimmed seems slightly brighter than gray-stone undimmed.. 7d7d7d is out of the way, 858585 forces eyes to read it, vs 8d8d8d? @@ -394,7 +395,7 @@ selection-ui = "#2e2b38" # no purple tinge, more closer to gray-stone, was accen marker13 = "#2d2d2d" # a barely visible gray # others scraped from aura -# cyan-aura = "#82e2ff" # seems like noctis's cyan.. also sticks out too much.. +cyan = "#82e2ff" # seems like noctis's cyan.. also sticks out too much.. # purple14 = "#af8aff7f" # light purple TODO: try it # purple-pleasant-opaque = "#a394f000" # purple-pleasant with 00 alpha (opaque?), was accent18 # NOTE: doesn't seem to make a difference.. From a90f242f389aa38d1ecea231c87b484c1101ac10 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Tue, 1 Oct 2024 05:59:53 -0700 Subject: [PATCH 14/20] hmm.. going backward.. --- runtime/themes/aurara.toml | 71 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 272fc1afc..e5b177dc2 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -20,8 +20,10 @@ # TODO: # maybe add a fallback for every table..? -# still not happy about blue-green used for namespace, especially for rust.. -# currently trying a dimmer shade of pink for variable-other, but there's too many keywords categorized in there.. +# not happy with aura's orange, it's just too dim.. boring! is noctis's orange really that bright..? +# still not happy about aura's blue-green used for namespace, especially for rust.. +# could try other colors for operators to make them more clear, and even punctuation +# currently trying a dimmer shade of pink for variable.other.member, but there's too many keywords categorized in there.. # create a white-stone with a tinge of color for variable.other..? # find out where the color for file picker is set, and try to dim it # i tried searching the other configs in the repo to no avail, just found ui.picker.header @@ -37,7 +39,7 @@ ## GENERAL ============================== -'warning' = { fg ="orange-warning", modifiers = ["bold"] } # Editor warnings. TEMP/TEST/WARN +'warning' = { fg ="orange-bright", modifiers = ["bold"] } # Editor warnings. TEMP/TEST/WARN 'error' = { fg = "red-error", modifiers = ["bold", "slow_blink"] } # Editor errors, like mis-typing a command. BUG ISSUE # but not ERROR..? 'info' = { fg = "blue-aqua" } # Code diagnostic info in gutter (LSP). TODO/INFO @@ -60,7 +62,7 @@ 'ui.window' = { fg = "gray-stone" } # Window border between splits. # pruple also works really well here.. maybe more needed when there are no line numbers.. -'ui.gutter' = { fg = "orange-warning"} # Left gutter for diagnostics and breakpoints. +'ui.gutter' = { fg = "orange-bright" } # Left gutter for diagnostics and breakpoints. 'ui.text' = { fg = "purple-pleasant-dimmer" } # Default text color. used in text files, pickers, ui, and more! 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. @@ -202,7 +204,7 @@ 'variable.function' = { fg = "orange" } # ? ruby-like everything is an object..? 'variable.other' = { fg = "white-stone" } # from aura.. # fallback -'variable.other.member' = { fg = "pink-dimmer" } # Fields of composite data types (e.g. structs, unions). +'variable.other.member' = { fg = "pink-dimmer" } # Fields of composite data types (e.g. structs, unions)., @callback in elixir, serialized data fields (like this config file..) # TODO: decide white-stone vs pink vs another color, and remember to turn down punctuation down a notch in hotness; would be nice to create a slightly tinged color, like noctis's white-sea-tinge 'label' = { fg = "purple" } # Loop labels in rust. @@ -212,7 +214,7 @@ 'punctuation.delimiter' = { fg = "pink-hot", modifiers = ["bold"] } # Commas and colons. # pink-hotter is slightly too annoying.. 'punctuation.bracket' = { fg = "pink", modifiers = ["bold"] } # Parentheses, angle brackets, etc. -'punctuation.special' = { fg = "gold", modifiers = ["bold"] } # no clue.. +'punctuation.special' = { fg = "orange-bright", modifiers = ["bold"] } # no clue.. # use gold to make it stick out a little.. 'keyword' = { fg = "purple" } # Language reserved keywords. var, void, let @@ -221,16 +223,16 @@ 'keyword.control.conditional' = { fg = "purple", modifiers = ["bold"] } # 'if', 'else', 'elif'. # TODO: could use a cascading shades of purple here, between purple and purple-darker of operator, darkest on the outside, yet it's also nice to have it consistent.. # 'keyword.control.repeat' = { } # 'for', 'while', 'loop'. -'keyword.control.import' = { fg = "orange", modifiers = ["italic", "bold"] } # 'import', 'export', 'use', 'mod' - # TODO: could use another color here.. +'keyword.control.import' = { fg = "purple", modifiers = ["italic"] } # 'import', 'export', 'use', 'mod' + # use crate::blah blah conflicts, crate is the same color.. 'keyword.control.return' = { fg = "pink-salmon", modifiers = ["italic"] } # 'return' in most languages. # NOTE: tried red-error, but it's so ugly!!.. :/ but could use it's own color.. stole noctis's pink-salmon here.. bold is really nice too, more pink-salmony, but it eventually bugged me..; italics makes it feel like it's *pressed* in 'keyword.control.exception' = { fg = "pink-salmon", modifiers = ["italic"] } # 'raise' in python. -'keyword.operator' = { fg = "purple-darker", modifiers = ["bold"] } # 'or', 'and', 'in'. +'keyword.operator' = { fg = "purple", modifiers = ["bold"] } # 'or', 'and', 'in'. # TODO: doesn't look like it's working..?? 'keyword.directive' = { fg = "purple", modifiers = ["italic"] } # Preprocessor directives (#if, #include in C). 'keyword.function' = { fg = "purple", modifiers = ["bold"] } # The keyword to define a funtion: 'def', 'fun', 'fn'. -'keyword.storage' = { fg = "purple" } # let and var in rust.. these should be more visible.. i tried defualt's almond, but it was just too bright.. +'keyword.storage' = { fg = "purple" } # let and var in rust.. these should be more visible.. 'keyword.storage.modifier' = { fg = "purple-dimmer", modifiers = ["italic"] } # function and type modifiers/accessors: public/private, mut, dyn, ref, &, internal, readonly, const, etc. # these should be less visible # bold makes sense here for C#, as it's usually the start of a function, but not so much for rust.. @@ -239,14 +241,14 @@ # matches type.builtin -'operator' = { fg = "purple-darker", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators +'operator' = { fg = "purple", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators # top three are ordered from brightest to darkest # also used in markup headings 'function' = { fg = "orange"} # TODO: orange-brighter is too bright.. :/ but much of the beauty of the theme comes from this color... just need to get a notch lower.. -'function.method' = { fg = "orange-dimmer" } # Class / Struct methods. -'function.builtin' = { fg = "gold-dim" } +'function.method' = { fg = "orange" } # Class / Struct methods. +'function.builtin' = { fg = "orange-desaturated" } 'function.macro' = { fg = "orange", modifiers = ["italic"] } # Like macros in rust. # italics works well here.. as does the magical gold of macros, as does orange-pumpkin 'function.special' = { fg = "orange", modifiers = ["italic"] } # Preprocessor in C. @@ -258,9 +260,8 @@ # namespace::function, namespace::class, package main, *types.Tuple # requires a seperate color # TODO: this nasty blue-green accurately matches how i feel about namespace syntax..: *barf*.. pink-hotter is interesting... really changes things up!.. but i still prefer something similar to blue for logical reasoning - # for a long time i was using italics here, but then discovered it was part of its ugliness! now it's actually tolerable..! - -# Markup ============================== + # for -dima long time i was using italics here, but then discovered it was part of its ugliness! now it's actualltolerabl +# pumpkin============================== # Colors for markup languages, like Markdown or XML. also affects comments!! # a little different from code since it's so simple, using a simple two color scheme: purple 'n gold @@ -268,31 +269,29 @@ markup = "purple-pleasant-dimmer" # fallback -'markup.bold' = { fg = "orange" } # Bold text. +'markup.bold' = { fg = "orange-bright" } # Bold text. # bold text isn't so easy to read.. but purple bold works pretty well alongside purple-pleasant # this orange is surprisingly dim! not bad at all, and keeps a consistent two-color theme. though, orange-brighter is far more beautiful, but perhaps too bright.. 'markup.italic' = { modifiers = ["italic"] } # Italicised text. "markup.strikethrough" = { modifiers = ["crossed_out"] } -'markup.heading' = { fg = "orange-brighter", modifiers = ["bold"] } # Markdown headings -# TODO: gold vs orange-brighter, i really just like the bolded gold, but if it's too bright, orange-brighter is perfect +'markup.heading' = { fg = "orange-bright", modifiers = ["bold"] } # Markdown headings # NOTE: underline didn't bold, and looked wayyy too thin compared to the bold font.. # underline = { style = "curl", modifiers = ["bold"] } -'markup.heading.1' = { fg = "orange-brighter", modifiers = ["bold"] } +'markup.heading.1' = { fg = "orange-bright", modifiers = ["bold"] } 'markup.heading.2' = { fg = "orange", modifiers = ["bold"] } -'markup.heading.3' = { fg = "gold" } -'markup.heading.4' = { fg = "orange-brighter" } +'markup.heading.3' = { fg = "orange-desaturated", modifiers = ["bold"] } +'markup.heading.4' = { fg = "orange-bright" } 'markup.heading.5' = { fg = "orange" } -'markup.heading.6' = { fg = "gold-dim" } -'markup.heading.marker' = { fg = "gold" } # Hashtag color on Markdown headings. - # bolded gold is too distracting.. +'markup.heading.6' = { fg = "orange-desaturated" } +'markup.heading.marker' = { fg = "orange-brighter" } # Hashtag color on Markdown headings. -'markup.list' = { fg = "gold", modifiers = ["bold"] } +'markup.list' = { fg = "orange-bright", modifiers = ["bold"] } # the bullet symbols are like shiny jewelry in the sea :) -'markup.list.numbered' = { fg = "gold" } # Numbered list. +'markup.list.numbered' = { fg = "orange-bright" } # Numbered list. # 'markup.list.unnumbered' = { } # Bullet point list. -'markup.link' = { underline = { style = "curl", modifiers = ["bold"] } } +'markup.link' = { fg = "gray-stone" } # different color is annoying in comments # seems to underline only when highlighted, which is great!! 'markup.link.url' = { fg = "gray-stone"} # Urls pointed to by links. @@ -323,7 +322,7 @@ markup = "purple-pleasant-dimmer" # fallback 'diff.plus' = "green-aqua" # { } # Additions. 'diff.minus' = "red-error" # { } # Deletions. -'diff.delta' = "orange-warning" # { } # Modifications. +'diff.delta' = "orange" # { } # Modifications. 'diff.delta.moved' = "green-sea" # Renamed or moved files / changes. @@ -341,9 +340,7 @@ pink-salmon = "#df769b" # re-used for return, was "pink", it's perfect! :D use s gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", ..maybe was also used for it's variable text..? purple-darker = "#6f60ea" # this purple is slightly darker than aura's, used for cascading keywords, but seems to match vs-code's aura better?? white-sea-tinged = "#b1cace" # has a tinge of green in it.., pleasant tho -orange = "#e4b782" # looks fantastic in noctics, fit for the sea theme, like a clown-fish, using it for functions -# orange-pumpkin = "#ff9e64" # orange from tokyonight, too bright but really orange! -orange-dimmer = "#e0af68" # yellow from tokyonight +orange-bright = "#e4b782" # looks fantastic in noctis, fit for the sea theme, like a clown-fish, but too bright :( green-dark = "#5b858b" # mainly for comments/background text, was "gray" red = "#e34e1b" @@ -361,8 +358,9 @@ purple-selection = "#3d375e7f" purple-selection-solid = "#29263c" blue-aqua = "#47ace8" # currently used for types, a pretty standard blue for classes.. green-aqua = "#54c59f" # used for constants/literals, not the prettiest, but it fits the aqua sea feelin' of the overall theme.. maybe can try bogster's green -orange-warning = "#c7a06f" # warning, like a dim hazard sign -pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation at the moment.. +orange = "#c7a06f" # used for functions, but feels too boring.. :( +orange-desaturated = "#C7B693" +pink = "#c17ac8" # great, comfy pink for pop-up-menu ui text, TODO: shuold be second main text color, but using it for punctuation t the moment.. # pink-lighter = "#cb90d1" # 1/7th shade lighter (whiter) # white-stone-pink = "#BEA7C1" # somewhere between white-stone and pink; meh... pink is just more clearly visible than the colors between.. # pink-brighter = "#DE95E5" @@ -405,7 +403,10 @@ light-green-complement = "#e9488a" # initially used to create a high-contrast co # from boo berry berry-desaturated = "#886C9C" # originally used for comments, but didn't quite work.. maybe because boo berry has a background color..; didn't quite work for keywords either, as it was too dim and didn't match the rest of the scheme, like dirty blood.. worth keeping! currently using for atoms, which isn't bad!.. -gold-dim = "#E3C0A8" # a really nice, dim color, more yellow than orange tho + +# from tokyonight +# orange-pumpkin = "#ff9e64" # orange from tokyonight, too bright but really orange! looks okay with dim modifier.. +# orange-tokyonight = "#e0af68" # yellow from tokyonight, similar to orange from noctis # TODO: "shades of purple" theme has an actual orangey orange, a nice fuschia/deep purple, a good red, and a cyan that isn't too bright From 92bc6bd26672e9df5702e34953413ba8811f5741 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Tue, 1 Oct 2024 06:18:15 -0700 Subject: [PATCH 15/20] dim brackets --- runtime/themes/aurara.toml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index e5b177dc2..f46c86d62 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -21,8 +21,8 @@ # TODO: # maybe add a fallback for every table..? # not happy with aura's orange, it's just too dim.. boring! is noctis's orange really that bright..? -# still not happy about aura's blue-green used for namespace, especially for rust.. -# could try other colors for operators to make them more clear, and even punctuation +# still not happy about aura's blue-green used for namespace, especially for rust.. desaturating didn't quite do it.. +# could try other colors for operators, and even punctuation # currently trying a dimmer shade of pink for variable.other.member, but there's too many keywords categorized in there.. # create a white-stone with a tinge of color for variable.other..? # find out where the color for file picker is set, and try to dim it @@ -31,7 +31,6 @@ # find a different color for built-in types, currently using aura's default green-sea # NOTE: -# struct counts as a keyword, not a type, which can be confusing.. maybe there's more keyword properties..?? # blinking doesn't work with italics, another reason to not italicize comments # can fetch syntax highlighting tests from here: # https://github.com/sharkdp/bat @@ -209,11 +208,11 @@ 'label' = { fg = "purple" } # Loop labels in rust. -'punctuation' = { fg = "pink", modifiers = ["bold"] } # (){}[]:;,. +'punctuation' = { fg = "pink-dimmer", modifiers = ["bold"] } # (){}[]:;,. # NOTE: the bolded gold from noctic is really, really nice, but it collides with the orange-brighter color; also, bolded white is too much white, should save white just for variables only 'punctuation.delimiter' = { fg = "pink-hot", modifiers = ["bold"] } # Commas and colons. # pink-hotter is slightly too annoying.. -'punctuation.bracket' = { fg = "pink", modifiers = ["bold"] } # Parentheses, angle brackets, etc. +'punctuation.bracket' = { fg = "pink-dimmer", modifiers = ["bold"] } # Parentheses, angle brackets, etc. 'punctuation.special' = { fg = "orange-bright", modifiers = ["bold"] } # no clue.. # use gold to make it stick out a little.. From d6b9cc4b2a4fd52b02c88eda5996b265be92b087 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Tue, 1 Oct 2024 07:20:04 -0700 Subject: [PATCH 16/20] tiny.. --- runtime/themes/aurara.toml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index f46c86d62..b583fa8f5 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -22,7 +22,7 @@ # maybe add a fallback for every table..? # not happy with aura's orange, it's just too dim.. boring! is noctis's orange really that bright..? # still not happy about aura's blue-green used for namespace, especially for rust.. desaturating didn't quite do it.. -# could try other colors for operators, and even punctuation +# could try other colors either operators or punctuation.. # currently trying a dimmer shade of pink for variable.other.member, but there's too many keywords categorized in there.. # create a white-stone with a tinge of color for variable.other..? # find out where the color for file picker is set, and try to dim it @@ -61,7 +61,7 @@ 'ui.window' = { fg = "gray-stone" } # Window border between splits. # pruple also works really well here.. maybe more needed when there are no line numbers.. -'ui.gutter' = { fg = "orange-bright" } # Left gutter for diagnostics and breakpoints. +'ui.gutter' = { fg = "gold" } # Left gutter for diagnostics and breakpoints. 'ui.text' = { fg = "purple-pleasant-dimmer" } # Default text color. used in text files, pickers, ui, and more! 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. @@ -252,7 +252,7 @@ # italics works well here.. as does the magical gold of macros, as does orange-pumpkin 'function.special' = { fg = "orange", modifiers = ["italic"] } # Preprocessor in C. -'tag' = { fg = "purple-darker", modifiers = ["italic"] } # As in for html. +'tag' = { fg = "purple-darker", modifiers = ["italic"] } # As in for html. also @tags in comments? # must be darker then the default text, and attribute 'namespace' = { fg = "blue-green" } # * Namespace keyword in java, C#, etc. @@ -320,9 +320,9 @@ markup = "purple-pleasant-dimmer" # fallback # Version control changes. 'diff.plus' = "green-aqua" # { } # Additions. -'diff.minus' = "red-error" # { } # Deletions. +'diff.minus' = "pink-salmon" # { } # Deletions. 'diff.delta' = "orange" # { } # Modifications. -'diff.delta.moved' = "green-sea" # Renamed or moved files / changes. +'diff.delta.moved' = "blue-aqua" # Renamed or moved files / changes. [palette] # Define your custom colors here. @@ -336,15 +336,16 @@ markup = "purple-pleasant-dimmer" # fallback light-green = "#48e9a7" # a nice sea green, bright neon when bolded, like the displays of deep sea instruments, was "green", re-used for text under the cursor pink-salmon = "#df769b" # re-used for return, was "pink", it's perfect! :D use sparingly as i really don't like themes with lots of red in it, only returns and maybe exceptions -gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", ..maybe was also used for it's variable text..? +gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", ..maybe was also used for it's variable text..? unfortunately, it's very bright. used for matching fuzzy search, special symbols, markdown symbols purple-darker = "#6f60ea" # this purple is slightly darker than aura's, used for cascading keywords, but seems to match vs-code's aura better?? white-sea-tinged = "#b1cace" # has a tinge of green in it.., pleasant tho orange-bright = "#e4b782" # looks fantastic in noctis, fit for the sea theme, like a clown-fish, but too bright :( green-dark = "#5b858b" # mainly for comments/background text, was "gray" -red = "#e34e1b" +# red = "#e34e1b" # an ugly red.. only good for errors.. using aura's instead, though they seem the same.. blue-green = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. just feels too saturated. it's closest to tokyonight's aqua, but dimmer # blue-green-desaturated = "#3B94A3" # hmmm, maybe desaturate isn't the answer.. just dims it.., but it's not a bad idea either.. +# blue-green = "#0098C2" # slightly bluer in hue # blue-green = "#2C98BF" blue-green, with slightly lower hue, more greener # blue-deep = "#3B8CFF" # a sort of standard blue, underwater deep blue, not bad for builtin types.. gives a different vibe.. cyan-bright = "#87efff" # a tad too bright.. just used for cursor match From ef20eaedba4e33a6b01a7d85b024b4929c3518a8 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:00:26 -0700 Subject: [PATCH 17/20] import colors, diagnostics, diff, design notes --- runtime/themes/aurara.toml | 94 ++++++++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 28 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index b583fa8f5..901b7a6ef 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -18,11 +18,28 @@ # License: MIT +# design +# mostly from natural convergences +# "soft"/"dim"/low-brightness colors + # this should've been done on the app/terminal level.. however, since i've already used mostly low-brightness colors, perhaps there can be special cases to use brighter colors, to make certain things stand out... anyway, now can make use of both palettes: dim and bright +# simple color scheme: purple as main text color (plain text, ui, possibly strings and/or comments), a secondary color (popups, punctuation or operators, variable.other?), tertiary color (functions) + +# the mains things you read should stick out, while the rest shouldn't +# a common line: +# modifier type-declaration variable operator type.function("string") +# most visible: variable operator function type +# clearly visible: operator, punctuation +# less visible: type-declaration +# least visible: modifiers + # TODO: +# should just inherit the original aura theme +# try purple for comments and something else for strings? # maybe add a fallback for every table..? # not happy with aura's orange, it's just too dim.. boring! is noctis's orange really that bright..? # still not happy about aura's blue-green used for namespace, especially for rust.. desaturating didn't quite do it.. -# could try other colors either operators or punctuation.. +# can try another color/shade for atoms..? although, it's not too bad.. +# could try other colors for either operators or punctuation.. # currently trying a dimmer shade of pink for variable.other.member, but there's too many keywords categorized in there.. # create a white-stone with a tinge of color for variable.other..? # find out where the color for file picker is set, and try to dim it @@ -43,16 +60,17 @@ # but not ERROR..? 'info' = { fg = "blue-aqua" } # Code diagnostic info in gutter (LSP). TODO/INFO # def prefer noctis's blue-aqua over aura's here -'hint' = { fg = "cyan", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP). +'hint' = { fg = "green-aqua", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP). # ? Difference between info and hint ? 'diagnostic' = { underline = { style = "line" } } # Code diagnostics in editing area (LSP). +'diagnostic.error' = { underline = { style = "curl", color = "red-error" }, modifiers = ["bold", "dim", "slow_blink"] } +"diagnostic.warning" = { underline = { style = "curl", color = "orange" }, modifiers = ["bold", "dim", "slow_blink" ] } +'diagnostic.info' = { underline = { style = "line", color = "blue-aqua" }, modifiers = ["bold", "dim", "slow_blink" ] } +'diagnostic.hint' = { underline = { style = "line", color = "green-aqua" }, modifiers = ["bold", "dim", "slow_blink" ] } + # TODO: TEST: diagnostics, might need a new set of colors..! can use all neon colors here!! definitely need to test all this blinking.. LOL 'diagnostic.unnecessary' = { modifiers = ["dim"] } # took this from default theme 'diagnostic.deprecated' = { modifiers = ["crossed_out"] } # took this from default theme -'diagnostic.error' = { underline = { style = "curl", color = "red-error" }, modifiers = ["bold", "slow_blink", "dim"] } -'diagnostic.hint' = { underline = { style = "line", color = "cyan-bright" }, modifiers = ["bold", "dim", "slow_blink" ] } -'diagnostic.info' = { underline = { style = "line", color = "blue-aqua" }, modifiers = ["bold", "dim", "slow_blink" ] } - # TODO: TEST: diagnostics, might need a new set of colors..! can use all neon colors here!! # UI ============================== # For styling helix itself. @@ -62,6 +80,8 @@ # pruple also works really well here.. maybe more needed when there are no line numbers.. 'ui.gutter' = { fg = "gold" } # Left gutter for diagnostics and breakpoints. + # background affects the entire background of the gutter! + # breakpoints are kinda hard to see, only the outline..? 'ui.text' = { fg = "purple-pleasant-dimmer" } # Default text color. used in text files, pickers, ui, and more! 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. @@ -69,7 +89,7 @@ # see ui.menu for auto-complete # NOTE: pink pops out more, making it better than the comfy purple-pleasant-dimmer here 'ui.text.inactive' = { fg = "gray-stone-lighter", modifiers = ["dim"] } # i think used in autocomplete suggestion.. - # TODO: a little hard to see, but i like it better than white-stone and purple-darker.. + # i might like this better than gray-purple 'ui.cursor' = { fg = "light-green-complement", bg = "light-green", modifiers = ["reversed", "bold" ] } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c). # should be slightly darker than primary cursor.. @@ -77,7 +97,7 @@ # TODO: NOTE: this blinking at a different timing then the selection's blink is too much!! lol, but i do prefer it to blink.. # 'ui.cursor.insert' = { fg = "pink", bg = "light-green", modifiers = ["reversed", "bold"] } # The cursor in insert mode (i). # 'ui.cursor.select' = { fg = "pink", bg = "light-green", modifiers = ["reversed", "bold"] } # The cursor in select mode (v). -'ui.cursor.match' = { fg = "cyan-bright", bg = "pink", modifiers = ["bold", "reversed", "slow_blink"] } # The matching parentheses of that under the cursor. +'ui.cursor.match' = { fg = "cyan", bg = "pink", modifiers = ["bold", "reversed", "slow_blink"] } # The matching parentheses of that under the cursor. # NOTE: changed from purple, which was a bit tough to see..; rapid_blink was just too annoying..; light-green was too much, trying cyan.. 'ui.selection' = { bg = "selection-ui", modifiers = [ "bold", "slow_blink" ] } # All currently selected text. @@ -97,10 +117,12 @@ 'ui.virtual.whitespace' = { fg = "gray-stone"} # Whitespace markers in editing area: newline.. 'ui.virtual.indent-guide' = { fg = "marker13" } # Indentation guides. -# 'ui.bufferline' = { fg = "red-error"} + +# 'ui.bufferline' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # 'ui.bufferline.active' = { underline = { style = "line" } } # not so pretty.., and it extends past the text -# 'ui.bufferline.inactive' # doesn't work.. +# 'ui.bufferline.inactive' = { fg = "gray-purple" } # BUG: doesn't work.. + # or berry-desturated # using ui.statusline as fallback instead: 'ui.statusline' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # Status line. and tab bar @@ -259,11 +281,11 @@ # namespace::function, namespace::class, package main, *types.Tuple # requires a seperate color # TODO: this nasty blue-green accurately matches how i feel about namespace syntax..: *barf*.. pink-hotter is interesting... really changes things up!.. but i still prefer something similar to blue for logical reasoning - # for -dima long time i was using italics here, but then discovered it was part of its ugliness! now it's actualltolerabl -# pumpkin============================== -# Colors for markup languages, like Markdown or XML. also affects comments!! + # for a long time i was using italics here, but then discovered it was part of its ugliness! now it's actually tolerable + +# Colors for markup languages, like Markdown or XML. + # a little different from code since it's so simple, using a simple two color scheme: purple 'n gold -# a little different from code since it's so simple, using a simple two color scheme: purple 'n gold # NOTE: it inherits the main text color from ui.text, and punctuation too markup = "purple-pleasant-dimmer" # fallback @@ -319,14 +341,18 @@ markup = "purple-pleasant-dimmer" # fallback # Diff ============================== # Version control changes. -'diff.plus' = "green-aqua" # { } # Additions. -'diff.minus' = "pink-salmon" # { } # Deletions. -'diff.delta' = "orange" # { } # Modifications. -'diff.delta.moved' = "blue-aqua" # Renamed or moved files / changes. +'diff.plus' = { fg = "green-aqua" } # Additions. +'diff.minus' = { fg = "pink-salmon", modifiers = ["slow_blink"] } # Deletions. + # shows up as a little red dash, so blinking actually works well here! +'diff.delta' = { fg = "orange" } # Modifications. +'diff.delta.moved' = {fg = "blue-aqua" } # Renamed or moved files / changes. + # could dim.. but i also quite like how clear it is.. especially without the line numbers. BUG: dim doesn't seem to work.. + # slow_blink is fun, but epilepsy-inducing, lol + # not sure where you'd see diff.delta.moved.. [palette] # Define your custom colors here. -# NOTE: there are 16 colors in the palette by default, these will override any that have the same name +# NOTE: there are 16 colors in the palette by default, these will override any that have the same name. TODO: in order to make it most compatible and future-proof, should really use thsoe color names, even if it's not actually that color # noctis # dark-green = "#00262a" # backgrounds @@ -345,10 +371,9 @@ green-dark = "#5b858b" # mainly for comments/background text, was "gray" blue-green = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. just feels too saturated. it's closest to tokyonight's aqua, but dimmer # blue-green-desaturated = "#3B94A3" # hmmm, maybe desaturate isn't the answer.. just dims it.., but it's not a bad idea either.. -# blue-green = "#0098C2" # slightly bluer in hue -# blue-green = "#2C98BF" blue-green, with slightly lower hue, more greener -# blue-deep = "#3B8CFF" # a sort of standard blue, underwater deep blue, not bad for builtin types.. gives a different vibe.. -cyan-bright = "#87efff" # a tad too bright.. just used for cursor match +# blue-green-blue = "#0098C2" # slightly bluer in hue, possible replacement for type.builtin, then can use green-sea with namespace +# blue-green-green = "#2C98BF" blue-green, with slightly lower hue, more greener +# cyan-bright = "#87efff" # a tad too bright.. # aura dark soft/dim @@ -377,10 +402,13 @@ gray-stone = "#6d6d6d" # comment, similar to white, but desaturated/grayed out, # gray-stone-dimmed = "#6d6d6d80" # 80 = 50%, 40 = 25% gray-stone-lighter = "#7d7d7d" # used for comments with the dim modifier; 9d9d9d dimmed seems slightly brighter than gray-stone undimmed.. 7d7d7d is out of the way, 858585 forces eyes to read it, vs 8d8d8d? # TODO: alpha doesn't seem to affect these, only dim works.. -bg = "#15141b" # was "black" +# bg = "#121016" # black, was accent28, slightly darker +bg = "#15141b" # was "black", quite dark.. high-contrast + # TODO: have to figure out how backgrounds work: shouldn't the gui app (terminal or not) handle it? +# bg = "#211D26" # a darker raisin black, was accent39, seems like a nice alternative +# bg = "#2d2b38" # raisin black, was accent30. much much lighter, tougher to see on transparent backgrounds -orange-brighter = "#ffca85" # brighter than noctis's orange -purple-pleasant = "#a394f033" # great comfy purp for ui, should be main color, used for text (in .txt files) and strings and ui, was accent17 +purple-pleasant = "#a394f033" # great comfy purp for ui, should be main color, used for text (in .txt files) and strings and ui, was accent17 (with 33 alpha) as TODO: secondary selection and accent18 (with 00 alpha) # NOTE: still use this with dim modifer to make a color even dimmer than purple-pleasant-dimmer purple-pleasant-dimmer = "#9889E4" # switch to using this as main text.. along with pink-dimmer @@ -393,10 +421,20 @@ selection-ui = "#2e2b38" # no purple tinge, more closer to gray-stone, was accen marker13 = "#2d2d2d" # a barely visible gray # others scraped from aura -cyan = "#82e2ff" # seems like noctis's cyan.. also sticks out too much.. +cyan = "#82e2ff" # seems like noctis's cyan.. also sticks out too much.., just used for cursor match.. # purple14 = "#af8aff7f" # light purple TODO: try it # purple-pleasant-opaque = "#a394f000" # purple-pleasant with 00 alpha (opaque?), was accent18 # NOTE: doesn't seem to make a difference.. +# accent4 = "#9dff65" # bright green +orange-brighter = "#ffca85" # brighter than noctis's orange, beautiful, was accent31 +# green-aqua-darker = "#3ea7847f" # was accent19 +# gray-purple = "#4d466e" # was accent22, english violet, too dark to read, almost charcoal.. perhaps used for grayed out text like for auto-suggestions? too dark for even inactive tabs.. +# accent25 = "#49c29a" # mint green, seems very close to green-aqua +# accent26 = "#00d89023" # emerald green, slightly brighter than the above, when without alpha +# TODO: untested colors below.. +# accent36 = "#a19c77" # debugging background +# accent37 = "#353424" # breakpoint frame highlight +# accent35 = "#525156" # activity bar inactive foreground, # new colors light-green-complement = "#e9488a" # initially used to create a high-contrast color for match surrounding pairs but it was too fugly to use as a cursor.. pink is better. currently using for secondary cursors as it's darker than the primary cursor's pink @@ -412,7 +450,7 @@ berry-desaturated = "#886C9C" # originally used for comments, but didn't quite w # TODO: try checking out noctis variants minimus and uva -# this site seems fine for buildings shades of a color.. +# try this site for buildings shades of a color.. # https://www.radix-ui.com/colors/custom # this site seems fun too.. From b38fc2baab0387104684f1065757e0e6723d28ab Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:04:38 -0700 Subject: [PATCH 18/20] minor fixes, go through all keys --- runtime/themes/aurara.toml | 44 ++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 901b7a6ef..59ab520bd 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -49,12 +49,15 @@ # NOTE: # blinking doesn't work with italics, another reason to not italicize comments +# see keys here: + # https://github.com/helix-editor/helix/blob/master/book/src/themes.md#scopes # can fetch syntax highlighting tests from here: # https://github.com/sharkdp/bat ## GENERAL ============================== +# the diagnostic info in the gutter area 'warning' = { fg ="orange-bright", modifiers = ["bold"] } # Editor warnings. TEMP/TEST/WARN 'error' = { fg = "red-error", modifiers = ["bold", "slow_blink"] } # Editor errors, like mis-typing a command. BUG ISSUE # but not ERROR..? @@ -63,12 +66,14 @@ 'hint' = { fg = "green-aqua", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP). # ? Difference between info and hint ? +# diagnostic info in the main text-editing area 'diagnostic' = { underline = { style = "line" } } # Code diagnostics in editing area (LSP). 'diagnostic.error' = { underline = { style = "curl", color = "red-error" }, modifiers = ["bold", "dim", "slow_blink"] } -"diagnostic.warning" = { underline = { style = "curl", color = "orange" }, modifiers = ["bold", "dim", "slow_blink" ] } -'diagnostic.info' = { underline = { style = "line", color = "blue-aqua" }, modifiers = ["bold", "dim", "slow_blink" ] } -'diagnostic.hint' = { underline = { style = "line", color = "green-aqua" }, modifiers = ["bold", "dim", "slow_blink" ] } +"diagnostic.warning" = { underline = { style = "curl", color = "orange" }, modifiers = ["bold", "dim" ] } +'diagnostic.info' = { underline = { style = "dashed", color = "blue-aqua" }, modifiers = ["bold", "dim" ] } +'diagnostic.hint' = { underline = { style = "dashed", color = "green-aqua" }, modifiers = ["bold", "dim" ] } # TODO: TEST: diagnostics, might need a new set of colors..! can use all neon colors here!! definitely need to test all this blinking.. LOL + # underline styles: line, curl, dashed, dotted, double_line 'diagnostic.unnecessary' = { modifiers = ["dim"] } # took this from default theme 'diagnostic.deprecated' = { modifiers = ["crossed_out"] } # took this from default theme @@ -76,12 +81,18 @@ # For styling helix itself. 'ui.background' = { fg = "purple-pleasant-dimmer", bg = "bg"} # Default background color., the fg seems to be used for borders.. +'ui.background.separator' = { fg = "gray-stone" } # below the input line in picker 'ui.window' = { fg = "gray-stone" } # Window border between splits. # pruple also works really well here.. maybe more needed when there are no line numbers.. 'ui.gutter' = { fg = "gold" } # Left gutter for diagnostics and breakpoints. # background affects the entire background of the gutter! # breakpoints are kinda hard to see, only the outline..? +# 'ui.butter.selected' = { bg = "selection-ui" } +# 'ui.debug.breakpoint' = "●" # character for breakpoint? nope, that's not it.. +'ui.debug.active' = { fg = "pink-dimmer" } # debug execution paused, gutter? +'ui.highlight.frameline' = { bg = "selection-ui" } # debug execution paused, line + # TODO: could use a tinted color here.. a little confusing as it uses the same background as selected text 'ui.text' = { fg = "purple-pleasant-dimmer" } # Default text color. used in text files, pickers, ui, and more! 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. @@ -106,17 +117,21 @@ # 'ui.cursorline.primary' = { bg = 'purple-selection' } # # TODO: would need a very dim color, between selection-ui and background.. it could work of primary selection has a tinge of color to it (purple-selection), but without that, it would make it even harder to see the selection -# 'ui.highlight.frameline' = { bg = "selection-ui" } # hmmm, not sure.. 'ui.linenr' = { fg = "purple-pleasant", modifiers = ["dim"]} # Line numbers. 'ui.linenr.selected' = { modifiers = [ "bold" ] } # Current line number. -'ui.virtual' = { fg = "purple-selection" } # Namespace for additions to the editing area. +'ui.virtual' = { fg = "gray-stone" } # Namespace for additions to the editing area. 'ui.virtual.ruler' = { bg = "selection-ui"} # Vertical rulers (colored columns in editing area). # TODO: TEST: haven't seen these two yet..error -'ui.virtual.whitespace' = { fg = "gray-stone"} # Whitespace markers in editing area: newline.. +# 'ui.virtual.whitespace' = { fg = "gray-stone"} # Whitespace markers in editing area: newline.. +# 'ui.virtual.wrap' +# 'ui.virtual.jump-label' 'ui.virtual.indent-guide' = { fg = "marker13" } # Indentation guides. +'ui.virtual.inlay-hint' = { fg = "purple-pleasant-dimmer" } # TODO: TEST: +# ui.virtual.inlay-hint.parameter +# ui.virtual.inlay-hint.type # 'ui.bufferline' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # 'ui.bufferline.active' = { underline = { style = "line" } } @@ -127,6 +142,8 @@ 'ui.statusline' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # Status line. and tab bar # NOTE: matches line numbers +# 'ui.statusline.separator' = '|' # not working..? don't think i'd need anyway, seems cleaner without it.. + 'ui.statusline.inactive' = { fg = "gray-stone", bg = "bg-ui", modifiers = [] } # Status line in unfocused windows. # seems very dim.., likely inherited, but i don't know how to uninherit it.., i do prefer it to be different from the text used for comments though.. so it's not bad.. @@ -148,6 +165,7 @@ 'ui.menu.selected' = { bg = "selection-ui", fg = "gold", modifiers = ["bold"] } # Selected autocomplete item. # not a fan of slow_blink here.. # gold is fantastic for selected text and fuzzy matching +# 'ui.menu.scroll' # 'ui.picker' = { fg = "purple" } # ope.. good guess.. "ui.picker.header" = { modifiers = ["bold"] } # TODO: TEST: i found this in another config, no clue yet.. @@ -226,6 +244,7 @@ 'variable.other' = { fg = "white-stone" } # from aura.. # fallback 'variable.other.member' = { fg = "pink-dimmer" } # Fields of composite data types (e.g. structs, unions)., @callback in elixir, serialized data fields (like this config file..) +# 'variable.other.member.private' # only for ECMAScript-based languages # TODO: decide white-stone vs pink vs another color, and remember to turn down punctuation down a notch in hotness; would be nice to create a slightly tinged color, like noctis's white-sea-tinge 'label' = { fg = "purple" } # Loop labels in rust. @@ -235,15 +254,14 @@ 'punctuation.delimiter' = { fg = "pink-hot", modifiers = ["bold"] } # Commas and colons. # pink-hotter is slightly too annoying.. 'punctuation.bracket' = { fg = "pink-dimmer", modifiers = ["bold"] } # Parentheses, angle brackets, etc. -'punctuation.special' = { fg = "orange-bright", modifiers = ["bold"] } # no clue.. - # use gold to make it stick out a little.. +'punctuation.special' = { fg = "pink-dimmer", modifiers = ["bold"] } # string interpolation 'keyword' = { fg = "purple" } # Language reserved keywords. var, void, let 'keyword.control' = { fg = "purple", modifiers = ["bold"] } # Control keywords. # NOTE: bold makes it slightly brighter too 'keyword.control.conditional' = { fg = "purple", modifiers = ["bold"] } # 'if', 'else', 'elif'. # TODO: could use a cascading shades of purple here, between purple and purple-darker of operator, darkest on the outside, yet it's also nice to have it consistent.. -# 'keyword.control.repeat' = { } # 'for', 'while', 'loop'. +'keyword.control.repeat' = { fg = "purple", modifiers = ["bold"] } # 'for', 'while', 'loop'. 'keyword.control.import' = { fg = "purple", modifiers = ["italic"] } # 'import', 'export', 'use', 'mod' # use crate::blah blah conflicts, crate is the same color.. 'keyword.control.return' = { fg = "pink-salmon", modifiers = ["italic"] } # 'return' in most languages. @@ -269,6 +287,7 @@ 'function' = { fg = "orange"} # TODO: orange-brighter is too bright.. :/ but much of the beauty of the theme comes from this color... just need to get a notch lower.. 'function.method' = { fg = "orange" } # Class / Struct methods. +# 'function.method.private' # just ECMAScript-based languages.. 'function.builtin' = { fg = "orange-desaturated" } 'function.macro' = { fg = "orange", modifiers = ["italic"] } # Like macros in rust. # italics works well here.. as does the magical gold of macros, as does orange-pumpkin @@ -276,6 +295,7 @@ 'tag' = { fg = "purple-darker", modifiers = ["italic"] } # As in for html. also @tags in comments? # must be darker then the default text, and attribute +#'tag.builtin' # ? 'namespace' = { fg = "blue-green" } # * Namespace keyword in java, C#, etc. # namespace::function, namespace::class, package main, *types.Tuple @@ -346,8 +366,10 @@ markup = "purple-pleasant-dimmer" # fallback # shows up as a little red dash, so blinking actually works well here! 'diff.delta' = { fg = "orange" } # Modifications. 'diff.delta.moved' = {fg = "blue-aqua" } # Renamed or moved files / changes. +'diff.delta.conflict' = { fg = "orange" } # could dim.. but i also quite like how clear it is.. especially without the line numbers. BUG: dim doesn't seem to work.. - # slow_blink is fun, but epilepsy-inducing, lol + # slow_blink is fun, but epilepsy-inducing, lol.. at least they blink at the same time! + # TODO: TEST: blinking on deletions, is it too distracting..? # not sure where you'd see diff.delta.moved.. @@ -366,7 +388,7 @@ gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", purple-darker = "#6f60ea" # this purple is slightly darker than aura's, used for cascading keywords, but seems to match vs-code's aura better?? white-sea-tinged = "#b1cace" # has a tinge of green in it.., pleasant tho orange-bright = "#e4b782" # looks fantastic in noctis, fit for the sea theme, like a clown-fish, but too bright :( -green-dark = "#5b858b" # mainly for comments/background text, was "gray" +green-sea-darker = "#5b858b" # was mainly used for comments/background text in noctis, was "gray", it's very readable but rather less saturated compared to the other colors.. TODO: a very good, unused reading color, not bad for atoms.. # red = "#e34e1b" # an ugly red.. only good for errors.. using aura's instead, though they seem the same.. blue-green = "#19a2b7" # TODO: quite hideous toxic aqua green... currently using for namespaces, as i don't have anymore colors.. just feels too saturated. it's closest to tokyonight's aqua, but dimmer From 4f3640be0314f8952fd648f2dedf3d5d74f33c50 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:53:41 -0700 Subject: [PATCH 19/20] ui background, no gold ;( --- runtime/themes/aurara.toml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 59ab520bd..090a64cc8 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -42,6 +42,7 @@ # could try other colors for either operators or punctuation.. # currently trying a dimmer shade of pink for variable.other.member, but there's too many keywords categorized in there.. # create a white-stone with a tinge of color for variable.other..? +# never found out why the derive macro is a bolded bright orange color.. # find out where the color for file picker is set, and try to dim it # i tried searching the other configs in the repo to no avail, just found ui.picker.header # oranger-brighter used for functions is slightly too bright, get a darker shade (using orange for now..) @@ -80,7 +81,7 @@ # UI ============================== # For styling helix itself. -'ui.background' = { fg = "purple-pleasant-dimmer", bg = "bg"} # Default background color., the fg seems to be used for borders.. +'ui.background' = { fg = "purple-pleasant-dimmer", bg = "bg-ui"} # Default background color., the fg seems to be used for borders.. 'ui.background.separator' = { fg = "gray-stone" } # below the input line in picker 'ui.window' = { fg = "gray-stone" } # Window border between splits. # pruple also works really well here.. maybe more needed when there are no line numbers.. @@ -88,7 +89,7 @@ 'ui.gutter' = { fg = "gold" } # Left gutter for diagnostics and breakpoints. # background affects the entire background of the gutter! # breakpoints are kinda hard to see, only the outline..? -# 'ui.butter.selected' = { bg = "selection-ui" } +# 'ui.gutter.selected' = { bg = "selection-ui" } # 'ui.debug.breakpoint' = "●" # character for breakpoint? nope, that's not it.. 'ui.debug.active' = { fg = "pink-dimmer" } # debug execution paused, gutter? 'ui.highlight.frameline' = { bg = "selection-ui" } # debug execution paused, line @@ -113,6 +114,7 @@ 'ui.selection' = { bg = "selection-ui", modifiers = [ "bold", "slow_blink" ] } # All currently selected text. # TODO: decide purple-selection vs the neutral selection-ui: purple is easier to see immediately, but the neutral selection shows text more clearly / less muddy, and with the aid of blinking, it's pretty easy to see too + # TODO: ...wish there were a "brighten" modifier.. # 'ui.selection.primary' = { bg = "purple-selection" } # The primary selection when there are multiple. # 'ui.cursorline.primary' = { bg = 'purple-selection' } # # TODO: would need a very dim color, between selection-ui and background.. it could work of primary selection has a tinge of color to it (purple-selection), but without that, it would make it even harder to see the selection @@ -158,11 +160,12 @@ 'ui.help' = { bg = "bg", fg = "pink-dimmer"} # `:command` descriptions above the command line. 'ui.highlight' = { bg = "selection-ui", modifiers = ["slow_blink"] } # selected contents of symbol pickers (spc-s, spc-S) and current line in buffer picker (spc-b). + # bold doesn't seem to work here.. -'ui.menu' = { fg = "purple-pleasant", bg = "bg", modifiers = ["dim"] } # Autocomplete menu. +'ui.menu' = { fg = "purple-pleasant", bg = "bg-ui", modifiers = ["dim"] } # Autocomplete menu. # a dim color that doesn't pop up makes sense here - # BUG: the dim modifier conflicts with the matching gold for the first line only -'ui.menu.selected' = { bg = "selection-ui", fg = "gold", modifiers = ["bold"] } # Selected autocomplete item. + # BUG: the dim modifier conflicts with the matching gold for the first line only, maybe the parent key's dim affects the child key..? +'ui.menu.selected' = { fg = "gold", bg = "selection-ui", modifiers = ["bold"] } # Selected autocomplete item. # not a fan of slow_blink here.. # gold is fantastic for selected text and fuzzy matching # 'ui.menu.scroll' @@ -170,8 +173,8 @@ # 'ui.picker' = { fg = "purple" } # ope.. good guess.. "ui.picker.header" = { modifiers = ["bold"] } # TODO: TEST: i found this in another config, no clue yet.. -'ui.popup' = { fg = "purple-pleasant-dimmer", bg = "bg" } # Documentation popups (space-k). -'ui.popup.info' = { fg = "purple", bg = "bg" } # Info popups box (space mode menu). just the borders. +'ui.popup' = { fg = "purple-pleasant-dimmer", bg = "bg-ui" } # Documentation popups (space-k). +'ui.popup.info' = { fg = "purple", bg = "bg-ui" } # Info popups box (space mode menu). just the borders. # gold is very pretty here.., but distracting.. purple creates a solid frame and feels out of the way.. # modifiers don't work here.. no shiny blinky stuff..; also dim doesn't work, so can't use purple-pleasant dimmed.. # "ui.menu.scroll" = { } @@ -181,9 +184,9 @@ 'property' = { fg = "green-aqua" } # Regex group names. # TODO: no clue.. never seen this.. just matching regex strings for now.. -'special' = { fg = "gold", modifiers = ["bold"] } # Special symbols e.g `?` in Rust, `...` in Hare, also derive macro..?? BUG: also used for fuzzy search?? +'special' = { fg = "orange-bright", modifiers = ["bold"] } # Special symbols e.g `?` in Rust, `...` in Hare, also derive macro..?? # rust's ? is usually squashed between punctuation ()?; - # gold is too bright, but fantastic for fuzzy search. pink-hotter works well for punctuation. gold also works well for the derive macro. it's also nice for it to just stick out, so as to indicate a syntax highlighting problem + # pink-hotter works well for punctuation. gold also works well for the derive macro. it's also nice for it to just stick out, so as to indicate a syntax highlighting problem 'attribute' = { fg = "purple", modifiers = ["italic"] } # Class attributes, html tag attributes. # italics makes sense for html tag attributes.. matching tag @@ -384,7 +387,7 @@ markup = "purple-pleasant-dimmer" # fallback light-green = "#48e9a7" # a nice sea green, bright neon when bolded, like the displays of deep sea instruments, was "green", re-used for text under the cursor pink-salmon = "#df769b" # re-used for return, was "pink", it's perfect! :D use sparingly as i really don't like themes with lots of red in it, only returns and maybe exceptions -gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", ..maybe was also used for it's variable text..? unfortunately, it's very bright. used for matching fuzzy search, special symbols, markdown symbols +gold = "#ffd800" # a nice, shiny bolded gold used for punctuation, was "yellow", ..maybe was also used for it's variable text..? unfortunately, it's very bright. used for matching fuzzy search, and other things that should really stick out, or otherwise highlighting selected text purple-darker = "#6f60ea" # this purple is slightly darker than aura's, used for cascading keywords, but seems to match vs-code's aura better?? white-sea-tinged = "#b1cace" # has a tinge of green in it.., pleasant tho orange-bright = "#e4b782" # looks fantastic in noctis, fit for the sea theme, like a clown-fish, but too bright :( From b56a7d07680e2e5060ef8aa4e1060652358ce521 Mon Sep 17 00:00:00 2001 From: rathewolf <1132053+rahil627@users.noreply.github.com> Date: Thu, 3 Oct 2024 21:39:46 -0700 Subject: [PATCH 20/20] fix background colors --- runtime/themes/aurara.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/runtime/themes/aurara.toml b/runtime/themes/aurara.toml index 090a64cc8..d8a5a2290 100644 --- a/runtime/themes/aurara.toml +++ b/runtime/themes/aurara.toml @@ -81,7 +81,10 @@ # UI ============================== # For styling helix itself. -'ui.background' = { fg = "purple-pleasant-dimmer", bg = "bg-ui"} # Default background color., the fg seems to be used for borders.. +# 'ui' = { bg = 'bg-ui' } + # doesn't work.. :/ +'ui.background' = { fg = "purple-pleasant-dimmer", bg = "bg"} # Default background color., the fg seems to be used for borders.. + # NOTE:this effects the main background of the text-editing area; it's values don't cascade down to popup/auto-complete/etc; you must override them in each key 'ui.background.separator' = { fg = "gray-stone" } # below the input line in picker 'ui.window' = { fg = "gray-stone" } # Window border between splits. # pruple also works really well here.. maybe more needed when there are no line numbers.. @@ -97,7 +100,7 @@ 'ui.text' = { fg = "purple-pleasant-dimmer" } # Default text color. used in text files, pickers, ui, and more! 'ui.text.focus' = { fg = "pink", bg = "selection-ui", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker. -'ui.text.info' = { fg = "pink-dimmer", bg ="bg" } # Info popup contents (space mode menu). +'ui.text.info' = { fg = "pink-dimmer", bg = "bg-ui" } # Info popup contents (space mode menu). # see ui.menu for auto-complete # NOTE: pink pops out more, making it better than the comfy purple-pleasant-dimmer here 'ui.text.inactive' = { fg = "gray-stone-lighter", modifiers = ["dim"] } # i think used in autocomplete suggestion.. @@ -157,7 +160,7 @@ # slow_blink on insert/select was too annoying.. # using a colored background was also too annoying -'ui.help' = { bg = "bg", fg = "pink-dimmer"} # `:command` descriptions above the command line. +'ui.help' = { fg = "pink-dimmer", bg = "bg-ui" } # `:command` descriptions above the command line. 'ui.highlight' = { bg = "selection-ui", modifiers = ["slow_blink"] } # selected contents of symbol pickers (spc-s, spc-S) and current line in buffer picker (spc-b). # bold doesn't seem to work here..