diff --git a/config/themes/default.nix b/config/themes/default.nix index a6d107b..75fdbb7 100755 --- a/config/themes/default.nix +++ b/config/themes/default.nix @@ -330,362 +330,6 @@ in { ${vesper} = import (schemePath + /vesper); ${wasp} = import (schemePath + /wasp); }; - currentColours = { - # Core Text Colours - text = - mapColour - "text" # catppuccin-frappe - - "text" # catppuccin-latte - - "text" # catppuccin-macchiato - - "text" # catppuccin-mocha - - "text" # rosepine - - "foreground"; # dracula - - subtext0 = - mapColour - "subtext0" # catppuccin-frappe - - "subtext0" # catppuccin-latte - - "subtext0" # catppuccin-macchiato - - "subtext0" # catppuccin-mocha - - "muted" # rosepine - - "foreground"; # dracula - - subtext1 = - mapColour - "subtext1" # catppuccin-frappe - - "subtext1" # catppuccin-latte - - "subtext1" # catppuccin-macchiato - - "subtext1" # catppuccin-mocha - - "subtle" # rosepine - - "foreground"; # dracula - # Background Colours - background0 = - mapColour - "crust" # catppuccin-frappe - - "crust" # catppuccin-latte - - "crust" # catppuccin-macchiato - - "crust" # catppuccin-mocha - - "highlight0" # rosepine - - "background"; # dracula - background1 = - mapColour - "base" # catppuccin-frappe - - "base" # catppuccin-latte - - "base" # catppuccin-macchiato - - "base" # catppuccin-mocha - - "base" # rosepine - - "background"; # dracula - - background2 = - mapColour - "mantle" # catppuccin-frappe - - "mantle" # catppuccin-latte - - "mantle" # catppuccin-macchiato - - "mantle" # catppuccin-mocha - - "surface" # rosepine - - "background"; # dracula - - # Surface Colours - surface0 = - mapColour - "surface0" # catppuccin-frappe - - "surface0" # catppuccin-latte - - "surface0" # catppuccin-macchiato - - "surface0" # catppuccin-mocha - - "highlight0" # rosepine - - "background"; # dracula - - surface1 = - mapColour - "surface1" # catppuccin-frappe - - "surface1" # catppuccin-latte - - "surface1" # catppuccin-macchiato - - "surface1" # catppuccin-mocha - - "highlight1" # rosepine - - "background"; # dracula - - surface2 = - mapColour - "surface2" # catppuccin-frappe - - "surface2" # catppuccin-latte - - "surface2" # catppuccin-macchiato - - "surface2" # catppuccin-mocha - - "highlight2" # rosepine - - "background"; # dracula - - # Overlay Colours - overlay0 = - mapColour - "overlay0" # catppuccin-frappe - - "overlay0" # catppuccin-latte - - "overlay0" # catppuccin-macchiato - - "overlay0" # catppuccin-mocha - - "muted" # rosepine - - "background"; # dracula - overlay1 = - mapColour - "overlay1" # catppuccin-frappe - - "overlay1" # catppuccin-latte - - "overlay1" # catppuccin-macchiato - - "overlay1" # catppuccin-mocha - - "subtle" # rosepine - - "background"; # dracula - - overlay2 = - # and comments - mapColour - "overlay2" # catppuccin-frappe - - "overlay2" # catppuccin-latte - - "overlay2" # catppuccin-macchiato - - "overlay2" # catppuccin-mocha - - "subtle" # rosepine - - "background"; # dracula - # Diagnostic Colours - error = - mapColour - "red" # catppuccin-frappe - - "red" # catppuccin-latte - - "red" # catppuccin-macchiato - - "red" # catppuccin-mocha - - "love" # rosepine - - "red"; # dracula - warning = - mapColour - "yellow" # catppuccin-frappe - - "yellow" # catppuccin-latte - - "yellow" # catppuccin-macchiato - - "yellow" # catppuccin-mocha - - "gold" # rosepine - - "yellow"; # dracula - noError = - mapColour - "green" # catppuccin-frappe - - "green" # catppuccin-latte - - "green" # catppuccin-macchiato - - "green" # catppuccin-mocha - - "pine" # rosepine - - "green"; # dracula - - label = - mapColour - "rosewater" # catppuccin-frappe - - "rosewater" # catppuccin-latte - - "rosewater" # catppuccin-macchiato - - "rosewater" # catppuccin-mocha - - "rose" # rosepine - - "pink"; # dracula - selection = - mapColour - "flamingo" # catppuccin-latte - - "flamingo" # catppuccin-frappe - - "flamingo" # catppuccin-macchiato - - "flamingo" # catppuccin-mocha - - "rose" # rosepine - - "pink"; # dracula - keyword = - mapColour - "mauve" # catppuccin-frappe - - "mauve" # catppuccin-latte - - "mauve" # catppuccin-macchiato - - "mauve" # catppuccin-mocha - - "iris" # rosepine - - "purple"; # dracula - parameter = - mapColour - "maroon" # catppuccin-frappe - - "maroon" # catppuccin-latte - - "maroon" # catppuccin-macchiato - - "maroon" # catppuccin-mocha - - "love" # rosepine - - "orange"; # dracula - constant = - mapColour - "peach" # catppuccin-frappe - - "peach" # catppuccin-latte - - "peach" # catppuccin-macchiato - - "peach" # catppuccin-mocha - - "gold" # rosepine - - "orange"; # dracula - regex = - mapColour - "pink" # catppuccin-frappe - - "pink" # catppuccin-latte - - "pink" # catppuccin-macchiato - - "pink" # catppuccin-mocha - - "love" # rosepine - - "purple"; # dracula - - character = - mapColour - "teal" # catppuccin-frappe - - "teal" # catppuccin-latte - - "teal" # catppuccin-macchiato - - "teal" # catppuccin-mocha - - "foam" # rosepine - - "comment"; # dracula - # Cool Accent Colours - operator = - mapColour - "sky" # catppuccin-frappe - - "sky" # catppuccin-latte - - "sky" # catppuccin-macchiato - - "sky" # catppuccin-mocha - - "foam" # rosepine - - "cyan"; # dracula - constructor = - mapColour - "sapphire" # catppuccin-frappe - - "sapphire" # catppuccin-latte - - "sapphire" # catppuccin-macchiato - - "sapphire" # catppuccin-mocha - - "foam" # rosepine - - "cyan"; # dracula - function = - mapColour - "blue" # catppuccin-frappe - - "blue" # catppuccin-latte - - "blue" # catppuccin-macchiato - - "blue" # catppuccin-mocha - - "pine" # rosepine - - "comment"; # dracula - link = - mapColour - "lavender" # catppuccin-frappe - - "lavender" # catppuccin-latte - - "lavender" # catppuccin-macchiato - - "lavender" # catppuccin-mocha - - "iris" # rosepine - - "cyan"; # dracula - }; + currentColours = import ./map {inherit mapColour;}; }; } diff --git a/config/themes/map/default.nix b/config/themes/map/default.nix new file mode 100644 index 0000000..baa15ef --- /dev/null +++ b/config/themes/map/default.nix @@ -0,0 +1,514 @@ +{mapColour}: { + # Core Text Colours + text = + mapColour + "editor_fg" # ayu dark + + "editor_fg" # ayu light + + "editor_fg" # ayu mirage + + "text" # catppuccin-frappe + + "text" # catppuccin-latte + + "text" # catppuccin-macchiato + + "text" # catppuccin-mocha + + "text" # rosepine + + "foreground"; # dracula + + subtext0 = + mapColour + "editor_fg" # ayu dark + + "editor_fg" # ayu light + + "editor_fg" # ayu mirage + + "subtext0" # catppuccin-frappe + + "subtext0" # catppuccin-latte + + "subtext0" # catppuccin-macchiato + + "subtext0" # catppuccin-mocha + + "muted" # rosepine + + "foreground"; # dracula + + subtext1 = + mapColour + "editor_fg" # ayu dark + + "editor_fg" # ayu light + + "editor_fg" # ayu mirage + + "subtext1" # catppuccin-frappe + + "subtext1" # catppuccin-latte + + "subtext1" # catppuccin-macchiato + + "subtext1" # catppuccin-mocha + + "subtle" # rosepine + + "foreground"; # dracula + + # Background Colours + background0 = + mapColour + "editor_bg" # ayu dark + + "editor_bg" #ayu light + + "editor_bg" # ayu mirage + + "crust" # catppuccin-frappe + + "crust" # catppuccin-latte + + "crust" # catppuccin-macchiato + + "crust" # catppuccin-mocha + + "highlight0" # rosepine + + "background"; # dracula + background1 = + mapColour + "editor_bg" # ayu dark + + "editor_bg" #ayu light + + "editor_bg" # ayu mirage + + "base" # catppuccin-frappe + + "base" # catppuccin-latte + + "base" # catppuccin-macchiato + + "base" # catppuccin-mocha + + "base" # rosepine + + "background"; # dracula + + background2 = + mapColour + "editor_bg" # ayu dark + + "editor_bg" #ayu light + + "editor_bg" # ayu mirage + + "mantle" # catppuccin-frappe + + "mantle" # catppuccin-latte + + "mantle" # catppuccin-macchiato + + "mantle" # catppuccin-mocha + + "surface" # rosepine + + "background"; # dracula + + # Surface Colours + surface0 = + mapColour + "ui_fg" # ayu dark + + "ui_fg" #ayu light + + "ui_fg" # ayu mirage + + "surface0" # catppuccin-frappe + + "surface0" # catppuccin-latte + + "surface0" # catppuccin-macchiato + + "surface0" # catppuccin-mocha + + "highlight0" # rosepine + + "background"; # dracula + + surface1 = + mapColour + "ui_fg" # ayu dark + + "ui_fg" #ayu light + + "ui_fg" # ayu mirage + + "surface1" # catppuccin-frappe + + "surface1" # catppuccin-latte + + "surface1" # catppuccin-macchiato + + "surface1" # catppuccin-mocha + + "highlight1" # rosepine + + "background"; # dracula + + surface2 = + mapColour + "ui_fg" # ayu dark + + "ui_fg" #ayu light + + "ui_fg" # ayu mirage + + "surface2" # catppuccin-frappe + + "surface2" # catppuccin-latte + + "surface2" # catppuccin-macchiato + + "surface2" # catppuccin-mocha + + "highlight2" # rosepine + + "background"; # dracula + + # Overlay Colours + overlay0 = + mapColour + "ui_selection" # ayu dark + + "ui_selection_active" #ayu light + + "ui_selection_active" # ayu mirage + + "overlay0" # catppuccin-frappe + + "overlay0" # catppuccin-latte + + "overlay0" # catppuccin-macchiato + + "overlay0" # catppuccin-mocha + + "muted" # rosepine + + "background"; # dracula + overlay1 = + mapColour + "ui_selection" # ayu dark + + "ui_selection_active" #ayu light + + "ui_selection_active" # ayu mirage + + "overlay1" # catppuccin-latte + + "overlay1" # catppuccin-frappe + + "overlay1" # catppuccin-macchiato + + "overlay1" # catppuccin-mocha + + "subtle" # rosepine + + "background"; # dracula + + overlay2 = + # and comments + mapColour + "ui_selection" # ayu dark + + "ui_selection_active" #ayu light + + "ui_selection_active" # ayu mirage + + "overlay2" # catppuccin-latte + + "overlay2" # catppuccin-frappe + + "overlay2" # catppuccin-macchiato + + "overlay2" # catppuccin-mocha + + "subtle" # rosepine + + "background"; # dracula + # Diagnostic Colours + error = + mapColour + "error" # ayu dark + + "error" #ayu light + + "error" # ayu mirage + + "red" # catppuccin-frappe + + "red" # catppuccin-latte + + "red" # catppuccin-macchiato + + "red" # catppuccin-mocha + + "love" # rosepine + + "red"; # dracula + warning = + mapColour + "accent" # ayu dark + + "accent" #ayu light + + "accent" # ayu mirage + + "yellow" # catppuccin-frappe + + "yellow" # catppuccin-latte + + "yellow" # catppuccin-macchiato + + "yellow" # catppuccin-mocha + + "gold" # rosepine + + "yellow"; # dracula + noError = + mapColour + "regex" # ayu dark + + "regex" #ayu light + + "regex" # ayu mirage + + "green" # catppuccin-frappe + + "green" # catppuccin-latte + + "green" # catppuccin-macchiato + + "green" # catppuccin-mocha + + "pine" # rosepine + + "green"; # dracula + + label = + mapColour + "tag" # ayu dark + + "tag" #ayu light + + "tag" # ayu mirage + + "rosewater" # catppuccin-frappe + + "rosewater" # catppuccin-latte + + "rosewater" # catppuccin-macchiato + + "rosewater" # catppuccin-mocha + + "rose" # rosepine + + "pink"; # dracula + selection = + mapColour + "editor_selection" # ayu dark + + "editor_selection" #ayu light + + "editor_selection" # ayu mirage + + "flamingo" # catppuccin-latte + + "flamingo" # catppuccin-frappe + + "flamingo" # catppuccin-macchiato + + "flamingo" # catppuccin-mocha + + "rose" # rosepine + + "pink"; # dracula + keyword = + mapColour + "keyword" # ayu dark + + "keyword" #ayu light + + "keyword" # ayu mirage + + "mauve" # catppuccin-frappe + + "mauve" # catppuccin-latte + + "mauve" # catppuccin-macchiato + + "mauve" # catppuccin-mocha + + "iris" # rosepine + + "purple"; # dracula + parameter = + mapColour + "entity" # ayu dark + + "entity" #ayu light + + "entity" # ayu mirage + + "maroon" # catppuccin-frappe + + "maroon" # catppuccin-latte + + "maroon" # catppuccin-macchiato + + "maroon" # catppuccin-mocha + + "love" # rosepine + + "orange"; # dracula + constant = + mapColour + "cosntant" # ayu dark + + "cosntant" #ayu light + + "cosntant" # ayu mirage + + "peach" # catppuccin-frappe + + "peach" # catppuccin-latte + + "peach" # catppuccin-macchiato + + "peach" # catppuccin-mocha + + "gold" # rosepine + + "orange"; # dracula + regex = + mapColour + "regex" # ayu dark + + "regex" #ayu light + + "regex" # ayu mirage + + "pink" # catppuccin-frappe + + "pink" # catppuccin-latte + + "pink" # catppuccin-macchiato + + "pink" # catppuccin-mocha + + "love" # rosepine + + "purple"; # dracula + + character = + mapColour + "special" # ayu dark + + "special" #ayu light + + "special" # ayu mirage + + "teal" # catppuccin-frappe + + "teal" # catppuccin-latte + + "teal" # catppuccin-macchiato + + "teal" # catppuccin-mocha + + "foam" # rosepine + + "comment"; # dracula + # Cool Accent Colours + operator = + mapColour + "operator" # ayu dark + + "operator" #ayu light + + "operator" # ayu mirage + + "sky" # catppuccin-frappe + + "sky" # catppuccin-latte + + "sky" # catppuccin-macchiato + + "sky" # catppuccin-mocha + + "foam" # rosepine + + "cyan"; # dracula + constructor = + mapColour + "constant" # ayu dark + + "constant" #ayu light + + "constant" # ayu mirage + + "sapphire" # catppuccin-frappe + + "sapphire" # catppuccin-latte + + "sapphire" # catppuccin-macchiato + + "sapphire" # catppuccin-mocha + + "foam" # rosepine + + "cyan"; # dracula + function = + mapColour + "func" # ayu dark + + "func" #ayu light + + "func" # ayu mirage + + "blue" # catppuccin-frappe + + "blue" # catppuccin-latte + + "blue" # catppuccin-macchiato + + "blue" # catppuccin-mocha + + "pine" # rosepine + + "comment"; # dracula + link = + mapColour + "string" # ayu dark + + "string" #ayu light + + "string" # ayu mirage + + "lavender" # catppuccin-frappe + + "lavender" # catppuccin-latte + + "lavender" # catppuccin-macchiato + + "lavender" # catppuccin-mocha + + "iris" # rosepine + + "cyan"; # dracula +} diff --git a/config/themes/schemes/ayu/dark/default.nix b/config/themes/schemes/ayu/dark/default.nix index fb84a9a..1cb730f 100644 --- a/config/themes/schemes/ayu/dark/default.nix +++ b/config/themes/schemes/ayu/dark/default.nix @@ -4,7 +4,7 @@ func = "FFB454"; entity = "59C2FF"; string = "AAD94C"; - regexp = "95E6CB"; + regex = "95E6CB"; markup = "F07178"; keyword = "FF8F40"; special = "E6B673"; diff --git a/config/themes/schemes/ayu/light/default.nix b/config/themes/schemes/ayu/light/default.nix index 709ea06..d859a97 100644 --- a/config/themes/schemes/ayu/light/default.nix +++ b/config/themes/schemes/ayu/light/default.nix @@ -4,7 +4,7 @@ func = "F2AE49"; entity = "399EE6"; string = "86B300"; - regexp = "4CBF99"; + regex = "4CBF99"; markup = "F07171"; keyword = "FA8D3E"; special = "E6BA7E"; diff --git a/config/themes/schemes/ayu/mirage/default.nix b/config/themes/schemes/ayu/mirage/default.nix index 90a2e85..fd81daf 100644 --- a/config/themes/schemes/ayu/mirage/default.nix +++ b/config/themes/schemes/ayu/mirage/default.nix @@ -4,7 +4,7 @@ func = "FFD173"; entity = "73D0FF"; string = "D5FF80"; - regexp = "95E6CB"; + regex = "95E6CB"; markup = "F28779"; keyword = "FFAD66"; special = "FFDFB3";