From f663e6f6908a9dfb05ac22e867e726c1bf6f0960 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 11 Jun 2025 00:41:05 +1000 Subject: internal: refactor for packaging Package using python-build, python-installer and hatch --- src/caelestia/subcommands/scheme.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/caelestia/subcommands/scheme.py (limited to 'src/caelestia/subcommands/scheme.py') diff --git a/src/caelestia/subcommands/scheme.py b/src/caelestia/subcommands/scheme.py new file mode 100644 index 0000000..37f9a2b --- /dev/null +++ b/src/caelestia/subcommands/scheme.py @@ -0,0 +1,11 @@ +from argparse import Namespace + + +class Command: + args: Namespace + + def __init__(self, args: Namespace) -> None: + self.args = args + + def run(self) -> None: + pass -- cgit v1.2.3-freya From f43987ef2f55ede746c5cc37567f5e74ba515fb3 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 11 Jun 2025 18:07:34 +1000 Subject: feat: impl scheme command (partial) --- src/caelestia/parser.py | 1 - src/caelestia/subcommands/scheme.py | 16 +++++++++++++++- src/caelestia/utils/scheme.py | 3 +++ 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src/caelestia/subcommands/scheme.py') diff --git a/src/caelestia/parser.py b/src/caelestia/parser.py index eb8734e..9718938 100644 --- a/src/caelestia/parser.py +++ b/src/caelestia/parser.py @@ -61,7 +61,6 @@ def parse_args() -> (argparse.ArgumentParser, argparse.Namespace): # Create parser for scheme opts scheme_parser = command_parser.add_parser("scheme", help="manage the colour scheme") scheme_parser.set_defaults(cls=scheme.Command) - scheme_parser.add_argument("-g", "--get", action="store_true", help="print the current scheme") scheme_parser.add_argument("-r", "--random", action="store_true", help="switch to a random scheme") scheme_parser.add_argument("-n", "--name", choices=get_scheme_names(), help="the name of the scheme to switch to") scheme_parser.add_argument("-f", "--flavour", help="the flavour to switch to") diff --git a/src/caelestia/subcommands/scheme.py b/src/caelestia/subcommands/scheme.py index 37f9a2b..19e62db 100644 --- a/src/caelestia/subcommands/scheme.py +++ b/src/caelestia/subcommands/scheme.py @@ -1,5 +1,7 @@ from argparse import Namespace +from caelestia.utils.scheme import get_scheme + class Command: args: Namespace @@ -8,4 +10,16 @@ class Command: self.args = args def run(self) -> None: - pass + scheme = get_scheme() + + if self.args.random: + scheme.set_random() + elif self.args.name or self.args.flavour or self.args.mode: + if self.args.name: + scheme.name = self.args.name + if self.args.flavour: + scheme.flavour = self.args.flavour + if self.args.mode: + scheme.mode = self.args.mode + else: + print(scheme) diff --git a/src/caelestia/utils/scheme.py b/src/caelestia/utils/scheme.py index 79a0c21..4b05100 100644 --- a/src/caelestia/utils/scheme.py +++ b/src/caelestia/utils/scheme.py @@ -120,6 +120,9 @@ class Scheme: def _update_colours(self) -> None: self._colours = read_colours_from_file(self.get_colours_path()) + def __str__(self) -> str: + return f"Scheme(name={self.name}, flavour={self.flavour}, mode={self.mode}, variant={self.variant})" + scheme_variants = [ "tonalspot", -- cgit v1.2.3-freya From d44bde166782928db85242e86df6190e9bcfa92a Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 11 Jun 2025 20:37:37 +1000 Subject: feat: theme hypr and terminals --- src/caelestia/subcommands/scheme.py | 2 + src/caelestia/utils/hypr.py | 2 +- src/caelestia/utils/theme.py | 86 +++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 src/caelestia/utils/theme.py (limited to 'src/caelestia/subcommands/scheme.py') diff --git a/src/caelestia/subcommands/scheme.py b/src/caelestia/subcommands/scheme.py index 19e62db..fa1f49a 100644 --- a/src/caelestia/subcommands/scheme.py +++ b/src/caelestia/subcommands/scheme.py @@ -1,6 +1,7 @@ from argparse import Namespace from caelestia.utils.scheme import get_scheme +from caelestia.utils.theme import apply_colours class Command: @@ -21,5 +22,6 @@ class Command: scheme.flavour = self.args.flavour if self.args.mode: scheme.mode = self.args.mode + apply_colours(scheme.colours) else: print(scheme) diff --git a/src/caelestia/utils/hypr.py b/src/caelestia/utils/hypr.py index 621e28e..3ba89cf 100644 --- a/src/caelestia/utils/hypr.py +++ b/src/caelestia/utils/hypr.py @@ -24,4 +24,4 @@ def message(msg: str, json: bool = True) -> str | dict[str, any]: def dispatch(dispatcher: str, *args: list[any]) -> bool: - return message(f"dispatch {dispatcher} {' '.join(str(a) for a in args)}".rstrip(), json=False) == "ok" + return message(f"dispatch {dispatcher} {' '.join(map(str, args))}".rstrip(), json=False) == "ok" diff --git a/src/caelestia/utils/theme.py b/src/caelestia/utils/theme.py new file mode 100644 index 0000000..7774472 --- /dev/null +++ b/src/caelestia/utils/theme.py @@ -0,0 +1,86 @@ +import json +import subprocess +from pathlib import Path + +from caelestia.utils.paths import config_dir + + +def gen_conf(colours: dict[str, str]) -> str: + conf = "" + for name, colour in colours.items(): + conf += f"${name} = {colour}\n" + return conf + + +def gen_scss(colours: dict[str, str]) -> str: + scss = "" + for name, colour in colours.items(): + scss += f"${name}: {colour};\n" + return scss + + +def c2s(c: str, *i: list[int]) -> str: + """Hex to ANSI sequence (e.g. ffffff, 11 -> \x1b]11;rgb:ff/ff/ff\x1b\\)""" + return f"\x1b]{';'.join(map(str, i))};rgb:{c[0:2]}/{c[2:4]}/{c[4:6]}\x1b\\" + + +def gen_sequences(colours: dict[str, str]) -> str: + """ + 10: foreground + 11: background + 12: cursor + 17: selection + 4: + 0 - 7: normal colours + 8 - 15: bright colours + 16+: 256 colours + """ + return ( + c2s(colours["onSurface"], 10) + + c2s(colours["surface"], 11) + + c2s(colours["secondary"], 12) + + c2s(colours["secondary"], 17) + + c2s(colours["surfaceContainer"], 4, 0) + + c2s(colours["red"], 4, 1) + + c2s(colours["green"], 4, 2) + + c2s(colours["yellow"], 4, 3) + + c2s(colours["blue"], 4, 4) + + c2s(colours["pink"], 4, 5) + + c2s(colours["teal"], 4, 6) + + c2s(colours["onSurfaceVariant"], 4, 7) + + c2s(colours["surfaceContainer"], 4, 8) + + c2s(colours["red"], 4, 9) + + c2s(colours["green"], 4, 10) + + c2s(colours["yellow"], 4, 11) + + c2s(colours["blue"], 4, 12) + + c2s(colours["pink"], 4, 13) + + c2s(colours["teal"], 4, 14) + + c2s(colours["onSurfaceVariant"], 4, 15) + + c2s(colours["primary"], 4, 16) + + c2s(colours["secondary"], 4, 17) + + c2s(colours["tertiary"], 4, 18) + ) + + +def try_write(path: Path, content: str) -> None: + try: + path.write_text(content) + except FileNotFoundError: + pass + + +def apply_terms(sequences: str) -> None: + pts_path = Path("/dev/pts") + for pt in pts_path.iterdir(): + if pt.name.isdigit(): + with pt.open("a") as f: + f.write(sequences) + + +def apply_hypr(conf: str) -> None: + try_write(config_dir / "hypr/scheme/current.conf", conf) + + +def apply_colours(colours: dict[str, str]) -> None: + apply_terms(gen_sequences(colours)) + apply_hypr(gen_conf(colours)) -- cgit v1.2.3-freya From 2161e3ee6b61c0ebd56142ccd9502404d3ee1314 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 11 Jun 2025 22:48:09 +1000 Subject: theme: better spicetify colours --- src/caelestia/data/templates/spicetify-dark.ini | 19 +++++++++++++++++++ src/caelestia/data/templates/spicetify-light.ini | 19 +++++++++++++++++++ src/caelestia/data/templates/spicetify.ini | 17 ----------------- src/caelestia/subcommands/scheme.py | 2 +- src/caelestia/utils/theme.py | 8 ++++---- 5 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 src/caelestia/data/templates/spicetify-dark.ini create mode 100644 src/caelestia/data/templates/spicetify-light.ini delete mode 100644 src/caelestia/data/templates/spicetify.ini (limited to 'src/caelestia/subcommands/scheme.py') diff --git a/src/caelestia/data/templates/spicetify-dark.ini b/src/caelestia/data/templates/spicetify-dark.ini new file mode 100644 index 0000000..4bf85eb --- /dev/null +++ b/src/caelestia/data/templates/spicetify-dark.ini @@ -0,0 +1,19 @@ +[caelestia] +text = {{ $onSurface }} ; Main text colour +subtext = {{ $onSurfaceVariant }} ; Subtext colour +main = {{ $surfaceContainer }} ; Panel backgrounds +highlight = {{ $primary }} ; Doesn't seem to do anything +misc = {{ $primary }} ; Doesn't seem to do anything +notification = {{ $outline }} ; Notifications probably +notification-error = {{ $error }} ; Error notifications probably +shadow = {{ $shadow }} ; Shadow for covers, context menu, also affects playlist/artist banners +card = {{ $surfaceContainerHigh }} ; Context menu and tooltips +player = {{ $secondaryContainer }} ; Background for top result in search +sidebar = {{ $surface }} ; Background +main-elevated = {{ $surfaceContainerHigh }} ; Higher layers than main, e.g. search bar +highlight-elevated = {{ $surfaceContainerHighest }} ; Home button and search bar accelerator +selected-row = {{ $onSurface }} ; Selections, hover, other coloured text and slider background +button = {{ $primary }} ; Slider and text buttons +button-active = {{ $primary }} ; Background buttons +button-disabled = {{ $outline }} ; Disabled buttons +tab-active = {{ $surfaceContainerHigh }} ; Profile fallbacks in search diff --git a/src/caelestia/data/templates/spicetify-light.ini b/src/caelestia/data/templates/spicetify-light.ini new file mode 100644 index 0000000..a8b361b --- /dev/null +++ b/src/caelestia/data/templates/spicetify-light.ini @@ -0,0 +1,19 @@ +[caelestia] +text = {{ $onSurface }} ; Main text colour +subtext = {{ $onSurfaceVariant }} ; Subtext colour +main = {{ $surface }} ; Panel backgrounds +highlight = {{ $primary }} ; Doesn't seem to do anything +misc = {{ $primary }} ; Doesn't seem to do anything +notification = {{ $outline }} ; Notifications probably +notification-error = {{ $error }} ; Error notifications probably +shadow = {{ $shadow }} ; Shadow for covers, context menu, also affects playlist/artist banners +card = {{ $surfaceContainer }} ; Context menu and tooltips +player = {{ $secondaryContainer }} ; Background for top result in search +sidebar = {{ $surfaceContainer }} ; Background +main-elevated = {{ $surfaceContainerHigh }} ; Higher layers than main, e.g. search bar +highlight-elevated = {{ $surfaceContainerHighest }} ; Home button and search bar accelerator +selected-row = {{ $onSurface }} ; Selections, hover, other coloured text and slider background +button = {{ $primary }} ; Slider and text buttons +button-active = {{ $primary }} ; Background buttons +button-disabled = {{ $outline }} ; Disabled buttons +tab-active = {{ $surfaceContainer }} ; Profile fallbacks in search diff --git a/src/caelestia/data/templates/spicetify.ini b/src/caelestia/data/templates/spicetify.ini deleted file mode 100644 index 976a0c9..0000000 --- a/src/caelestia/data/templates/spicetify.ini +++ /dev/null @@ -1,17 +0,0 @@ -[caelestia] -text = {{ $text }} ; Main text colour -subtext = {{ $subtext0 }} ; Subtext colour -main = {{ $base }} ; Panel backgrounds -highlight = {{ $primary }} ; Doesn't seem to do anything -misc = {{ $primary }} ; Doesn't seem to do anything -notification = {{ $overlay0 }} ; Notifications probably -notification-error = {{ $error }} ; Error notifications probably -shadow = {{ $mantle }} ; Shadow for covers, context menu, also affects playlist/artist banners -card = {{ $surface0 }} ; Context menu and tooltips -player = {{ $base }} ; Doesn't seem to do anything -sidebar = {{ $mantle }} ; Background -main-elevated = {{ $surface0 }} ; Higher layers than main, e.g. search bar -selected-row = {{ $text }} ; Selections, hover, other coloured text and slider background -button = {{ $primary }} ; Slider and text buttons -button-active = {{ $primary }} ; Background buttons -button-disabled = {{ $overlay0 }} ; Disabled buttons diff --git a/src/caelestia/subcommands/scheme.py b/src/caelestia/subcommands/scheme.py index fa1f49a..e149d13 100644 --- a/src/caelestia/subcommands/scheme.py +++ b/src/caelestia/subcommands/scheme.py @@ -22,6 +22,6 @@ class Command: scheme.flavour = self.args.flavour if self.args.mode: scheme.mode = self.args.mode - apply_colours(scheme.colours) + apply_colours(scheme.colours, scheme.mode) else: print(scheme) diff --git a/src/caelestia/utils/theme.py b/src/caelestia/utils/theme.py index 7f29637..3250ea3 100644 --- a/src/caelestia/utils/theme.py +++ b/src/caelestia/utils/theme.py @@ -97,8 +97,8 @@ def apply_discord(scss: str) -> None: try_write(config_dir / client / "themes/caelestia.theme.css", conf) -def apply_spicetify(colours: dict[str, str]) -> None: - template = gen_replace(colours, templates_dir / "spicetify.ini") +def apply_spicetify(colours: dict[str, str], mode: str) -> None: + template = gen_replace(colours, templates_dir / f"spicetify-{mode}.ini") try_write(config_dir / "spicetify/Themes/caelestia/color.ini", template) @@ -113,10 +113,10 @@ def apply_btop(colours: dict[str, str]) -> None: subprocess.run(["killall", "-USR2", "btop"]) -def apply_colours(colours: dict[str, str]) -> None: +def apply_colours(colours: dict[str, str], mode: str) -> None: apply_terms(gen_sequences(colours)) apply_hypr(gen_conf(colours)) apply_discord(gen_scss(colours)) - apply_spicetify(colours) + apply_spicetify(colours, mode) apply_fuzzel(colours) apply_btop(colours) -- cgit v1.2.3-freya From 672ef4a2d9291fb4333e6d6aa807826d6860259a Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Thu, 12 Jun 2025 16:00:43 +1000 Subject: scheme: impl random + fix single schemes --- src/caelestia/data/schemes/oldworld/dark.txt | 81 ---------------------- .../data/schemes/oldworld/default/dark.txt | 81 ++++++++++++++++++++++ src/caelestia/data/schemes/onedark/dark.txt | 81 ---------------------- .../data/schemes/onedark/default/dark.txt | 81 ++++++++++++++++++++++ src/caelestia/data/schemes/shadotheme/dark.txt | 81 ---------------------- .../data/schemes/shadotheme/default/dark.txt | 81 ++++++++++++++++++++++ src/caelestia/subcommands/scheme.py | 1 + src/caelestia/utils/material/generator.py | 2 +- src/caelestia/utils/scheme.py | 8 +++ 9 files changed, 253 insertions(+), 244 deletions(-) delete mode 100644 src/caelestia/data/schemes/oldworld/dark.txt create mode 100644 src/caelestia/data/schemes/oldworld/default/dark.txt delete mode 100644 src/caelestia/data/schemes/onedark/dark.txt create mode 100644 src/caelestia/data/schemes/onedark/default/dark.txt delete mode 100644 src/caelestia/data/schemes/shadotheme/dark.txt create mode 100644 src/caelestia/data/schemes/shadotheme/default/dark.txt (limited to 'src/caelestia/subcommands/scheme.py') diff --git a/src/caelestia/data/schemes/oldworld/dark.txt b/src/caelestia/data/schemes/oldworld/dark.txt deleted file mode 100644 index 846dc18..0000000 --- a/src/caelestia/data/schemes/oldworld/dark.txt +++ /dev/null @@ -1,81 +0,0 @@ -rosewater f4d3d3 -flamingo edbab5 -pink e29eca -mauve c99ee2 -red ea83a5 -maroon f49eba -peach f5a191 -yellow e6b99d -green 90b99f -teal 85b5ba -sky 69b6e0 -sapphire 5b9fba -blue 92a2d5 -lavender aca1cf -text c9c7cd -subtext1 9998a8 -subtext0 757581 -overlay2 57575f -overlay1 3e3e43 -overlay0 353539 -surface2 2a2a2d -surface1 27272a -surface0 1b1b1d -base 161617 -mantle 131314 -crust 101011 -success 90b99f -primary_paletteKeyColor 5A77AB -secondary_paletteKeyColor 6E778A -tertiary_paletteKeyColor 8A6E8E -neutral_paletteKeyColor 76777D -neutral_variant_paletteKeyColor 74777F -background 111318 -onBackground E2E2E9 -surface 111318 -surfaceDim 111318 -surfaceBright 37393E -surfaceContainerLowest 0C0E13 -surfaceContainerLow 191C20 -surfaceContainer 1E2025 -surfaceContainerHigh 282A2F -surfaceContainerHighest 33353A -onSurface E2E2E9 -surfaceVariant 44474E -onSurfaceVariant C4C6D0 -inverseSurface E2E2E9 -inverseOnSurface 2E3036 -outline 8E9099 -outlineVariant 44474E -shadow 000000 -scrim 000000 -surfaceTint ABC7FF -primary ABC7FF -onPrimary 0B305F -primaryContainer 284777 -onPrimaryContainer D7E3FF -inversePrimary 415E91 -secondary BEC6DC -onSecondary 283141 -secondaryContainer 3E4759 -onSecondaryContainer DAE2F9 -tertiary DDBCE0 -onTertiary 3F2844 -tertiaryContainer A587A9 -onTertiaryContainer 000000 -error FFB4AB -onError 690005 -errorContainer 93000A -onErrorContainer FFDAD6 -primaryFixed D7E3FF -primaryFixedDim ABC7FF -onPrimaryFixed 001B3F -onPrimaryFixedVariant 284777 -secondaryFixed DAE2F9 -secondaryFixedDim BEC6DC -onSecondaryFixed 131C2B -onSecondaryFixedVariant 3E4759 -tertiaryFixed FAD8FD -tertiaryFixedDim DDBCE0 -onTertiaryFixed 28132E -onTertiaryFixedVariant 573E5C \ No newline at end of file diff --git a/src/caelestia/data/schemes/oldworld/default/dark.txt b/src/caelestia/data/schemes/oldworld/default/dark.txt new file mode 100644 index 0000000..846dc18 --- /dev/null +++ b/src/caelestia/data/schemes/oldworld/default/dark.txt @@ -0,0 +1,81 @@ +rosewater f4d3d3 +flamingo edbab5 +pink e29eca +mauve c99ee2 +red ea83a5 +maroon f49eba +peach f5a191 +yellow e6b99d +green 90b99f +teal 85b5ba +sky 69b6e0 +sapphire 5b9fba +blue 92a2d5 +lavender aca1cf +text c9c7cd +subtext1 9998a8 +subtext0 757581 +overlay2 57575f +overlay1 3e3e43 +overlay0 353539 +surface2 2a2a2d +surface1 27272a +surface0 1b1b1d +base 161617 +mantle 131314 +crust 101011 +success 90b99f +primary_paletteKeyColor 5A77AB +secondary_paletteKeyColor 6E778A +tertiary_paletteKeyColor 8A6E8E +neutral_paletteKeyColor 76777D +neutral_variant_paletteKeyColor 74777F +background 111318 +onBackground E2E2E9 +surface 111318 +surfaceDim 111318 +surfaceBright 37393E +surfaceContainerLowest 0C0E13 +surfaceContainerLow 191C20 +surfaceContainer 1E2025 +surfaceContainerHigh 282A2F +surfaceContainerHighest 33353A +onSurface E2E2E9 +surfaceVariant 44474E +onSurfaceVariant C4C6D0 +inverseSurface E2E2E9 +inverseOnSurface 2E3036 +outline 8E9099 +outlineVariant 44474E +shadow 000000 +scrim 000000 +surfaceTint ABC7FF +primary ABC7FF +onPrimary 0B305F +primaryContainer 284777 +onPrimaryContainer D7E3FF +inversePrimary 415E91 +secondary BEC6DC +onSecondary 283141 +secondaryContainer 3E4759 +onSecondaryContainer DAE2F9 +tertiary DDBCE0 +onTertiary 3F2844 +tertiaryContainer A587A9 +onTertiaryContainer 000000 +error FFB4AB +onError 690005 +errorContainer 93000A +onErrorContainer FFDAD6 +primaryFixed D7E3FF +primaryFixedDim ABC7FF +onPrimaryFixed 001B3F +onPrimaryFixedVariant 284777 +secondaryFixed DAE2F9 +secondaryFixedDim BEC6DC +onSecondaryFixed 131C2B +onSecondaryFixedVariant 3E4759 +tertiaryFixed FAD8FD +tertiaryFixedDim DDBCE0 +onTertiaryFixed 28132E +onTertiaryFixedVariant 573E5C \ No newline at end of file diff --git a/src/caelestia/data/schemes/onedark/dark.txt b/src/caelestia/data/schemes/onedark/dark.txt deleted file mode 100644 index 269096e..0000000 --- a/src/caelestia/data/schemes/onedark/dark.txt +++ /dev/null @@ -1,81 +0,0 @@ -rosewater edcbc5 -flamingo d3a4a4 -pink d792c6 -mauve c678dd -red be5046 -maroon e06c75 -peach d19a66 -yellow e5c07b -green 98c379 -teal 56b6c2 -sky 90ccd7 -sapphire 389dcc -blue 61afef -lavender 8e98d9 -text abb2bf -subtext1 95a0b5 -subtext0 838b9c -overlay2 767f8f -overlay1 666e7c -overlay0 5c6370 -surface2 4b5263 -surface1 3c414f -surface0 30343e -base 282c34 -mantle 21242b -crust 1e2126 -success 98c379 -primary_paletteKeyColor 5878AB -secondary_paletteKeyColor 6E778A -tertiary_paletteKeyColor 896E8F -neutral_paletteKeyColor 75777D -neutral_variant_paletteKeyColor 74777F -background 111318 -onBackground E1E2E9 -surface 111318 -surfaceDim 111318 -surfaceBright 37393E -surfaceContainerLowest 0C0E13 -surfaceContainerLow 191C20 -surfaceContainer 1D2024 -surfaceContainerHigh 282A2F -surfaceContainerHighest 33353A -onSurface E1E2E9 -surfaceVariant 43474E -onSurfaceVariant C4C6CF -inverseSurface E1E2E9 -inverseOnSurface 2E3035 -outline 8E9099 -outlineVariant 43474E -shadow 000000 -scrim 000000 -surfaceTint A8C8FF -primary A8C8FF -onPrimary 06305F -primaryContainer 254777 -onPrimaryContainer D5E3FF -inversePrimary 3F5F90 -secondary BDC7DC -onSecondary 273141 -secondaryContainer 40495B -onSecondaryContainer D9E3F8 -tertiary DBBCE1 -onTertiary 3E2845 -tertiaryContainer A387AA -onTertiaryContainer 000000 -error FFB4AB -onError 690005 -errorContainer 93000A -onErrorContainer FFDAD6 -primaryFixed D5E3FF -primaryFixedDim A8C8FF -onPrimaryFixed 001B3C -onPrimaryFixedVariant 254777 -secondaryFixed D9E3F8 -secondaryFixedDim BDC7DC -onSecondaryFixed 121C2B -onSecondaryFixedVariant 3E4758 -tertiaryFixed F8D8FE -tertiaryFixedDim DBBCE1 -onTertiaryFixed 28132F -onTertiaryFixedVariant 563E5D \ No newline at end of file diff --git a/src/caelestia/data/schemes/onedark/default/dark.txt b/src/caelestia/data/schemes/onedark/default/dark.txt new file mode 100644 index 0000000..269096e --- /dev/null +++ b/src/caelestia/data/schemes/onedark/default/dark.txt @@ -0,0 +1,81 @@ +rosewater edcbc5 +flamingo d3a4a4 +pink d792c6 +mauve c678dd +red be5046 +maroon e06c75 +peach d19a66 +yellow e5c07b +green 98c379 +teal 56b6c2 +sky 90ccd7 +sapphire 389dcc +blue 61afef +lavender 8e98d9 +text abb2bf +subtext1 95a0b5 +subtext0 838b9c +overlay2 767f8f +overlay1 666e7c +overlay0 5c6370 +surface2 4b5263 +surface1 3c414f +surface0 30343e +base 282c34 +mantle 21242b +crust 1e2126 +success 98c379 +primary_paletteKeyColor 5878AB +secondary_paletteKeyColor 6E778A +tertiary_paletteKeyColor 896E8F +neutral_paletteKeyColor 75777D +neutral_variant_paletteKeyColor 74777F +background 111318 +onBackground E1E2E9 +surface 111318 +surfaceDim 111318 +surfaceBright 37393E +surfaceContainerLowest 0C0E13 +surfaceContainerLow 191C20 +surfaceContainer 1D2024 +surfaceContainerHigh 282A2F +surfaceContainerHighest 33353A +onSurface E1E2E9 +surfaceVariant 43474E +onSurfaceVariant C4C6CF +inverseSurface E1E2E9 +inverseOnSurface 2E3035 +outline 8E9099 +outlineVariant 43474E +shadow 000000 +scrim 000000 +surfaceTint A8C8FF +primary A8C8FF +onPrimary 06305F +primaryContainer 254777 +onPrimaryContainer D5E3FF +inversePrimary 3F5F90 +secondary BDC7DC +onSecondary 273141 +secondaryContainer 40495B +onSecondaryContainer D9E3F8 +tertiary DBBCE1 +onTertiary 3E2845 +tertiaryContainer A387AA +onTertiaryContainer 000000 +error FFB4AB +onError 690005 +errorContainer 93000A +onErrorContainer FFDAD6 +primaryFixed D5E3FF +primaryFixedDim A8C8FF +onPrimaryFixed 001B3C +onPrimaryFixedVariant 254777 +secondaryFixed D9E3F8 +secondaryFixedDim BDC7DC +onSecondaryFixed 121C2B +onSecondaryFixedVariant 3E4758 +tertiaryFixed F8D8FE +tertiaryFixedDim DBBCE1 +onTertiaryFixed 28132F +onTertiaryFixedVariant 563E5D \ No newline at end of file diff --git a/src/caelestia/data/schemes/shadotheme/dark.txt b/src/caelestia/data/schemes/shadotheme/dark.txt deleted file mode 100644 index e178804..0000000 --- a/src/caelestia/data/schemes/shadotheme/dark.txt +++ /dev/null @@ -1,81 +0,0 @@ -rosewater f1c4e0 -flamingo F18FB0 -pink a8899c -mauve E9729D -red B52A5B -maroon FF4971 -peach ff79c6 -yellow 8897F4 -green 6a5acd -teal F18FB0 -sky 4484d1 -sapphire 2f77a1 -blue bd93f9 -lavender 849BE0 -text e3c7fc -subtext1 CBB2E1 -subtext0 B39DC7 -overlay2 9A88AC -overlay1 827392 -overlay0 6A5D77 -surface2 52485D -surface1 393342 -surface0 211E28 -base 09090d -mantle 060608 -crust 030304 -success 37d4a7 -primary_paletteKeyColor 6F72AC -secondary_paletteKeyColor 75758B -tertiary_paletteKeyColor 936B83 -neutral_paletteKeyColor 78767D -neutral_variant_paletteKeyColor 777680 -background 131318 -onBackground E4E1E9 -surface 131318 -surfaceDim 131318 -surfaceBright 39383F -surfaceContainerLowest 0E0E13 -surfaceContainerLow 1B1B21 -surfaceContainer 1F1F25 -surfaceContainerHigh 2A292F -surfaceContainerHighest 35343A -onSurface E4E1E9 -surfaceVariant 46464F -onSurfaceVariant C7C5D0 -inverseSurface E4E1E9 -inverseOnSurface 303036 -outline 918F9A -outlineVariant 46464F -shadow 000000 -scrim 000000 -surfaceTint BFC1FF -primary BFC1FF -onPrimary 282B60 -primaryContainer 3F4178 -onPrimaryContainer E1E0FF -inversePrimary 565992 -secondary C5C4DD -onSecondary 2E2F42 -secondaryContainer 47475B -onSecondaryContainer E2E0F9 -tertiary E8B9D4 -onTertiary 46263B -tertiaryContainer AF849D -onTertiaryContainer 000000 -error FFB4AB -onError 690005 -errorContainer 93000A -onErrorContainer FFDAD6 -primaryFixed E1E0FF -primaryFixedDim BFC1FF -onPrimaryFixed 12144B -onPrimaryFixedVariant 3F4178 -secondaryFixed E2E0F9 -secondaryFixedDim C5C4DD -onSecondaryFixed 191A2C -onSecondaryFixedVariant 454559 -tertiaryFixed FFD8ED -tertiaryFixedDim E8B9D4 -onTertiaryFixed 2E1125 -onTertiaryFixedVariant 5F3C52 \ No newline at end of file diff --git a/src/caelestia/data/schemes/shadotheme/default/dark.txt b/src/caelestia/data/schemes/shadotheme/default/dark.txt new file mode 100644 index 0000000..e178804 --- /dev/null +++ b/src/caelestia/data/schemes/shadotheme/default/dark.txt @@ -0,0 +1,81 @@ +rosewater f1c4e0 +flamingo F18FB0 +pink a8899c +mauve E9729D +red B52A5B +maroon FF4971 +peach ff79c6 +yellow 8897F4 +green 6a5acd +teal F18FB0 +sky 4484d1 +sapphire 2f77a1 +blue bd93f9 +lavender 849BE0 +text e3c7fc +subtext1 CBB2E1 +subtext0 B39DC7 +overlay2 9A88AC +overlay1 827392 +overlay0 6A5D77 +surface2 52485D +surface1 393342 +surface0 211E28 +base 09090d +mantle 060608 +crust 030304 +success 37d4a7 +primary_paletteKeyColor 6F72AC +secondary_paletteKeyColor 75758B +tertiary_paletteKeyColor 936B83 +neutral_paletteKeyColor 78767D +neutral_variant_paletteKeyColor 777680 +background 131318 +onBackground E4E1E9 +surface 131318 +surfaceDim 131318 +surfaceBright 39383F +surfaceContainerLowest 0E0E13 +surfaceContainerLow 1B1B21 +surfaceContainer 1F1F25 +surfaceContainerHigh 2A292F +surfaceContainerHighest 35343A +onSurface E4E1E9 +surfaceVariant 46464F +onSurfaceVariant C7C5D0 +inverseSurface E4E1E9 +inverseOnSurface 303036 +outline 918F9A +outlineVariant 46464F +shadow 000000 +scrim 000000 +surfaceTint BFC1FF +primary BFC1FF +onPrimary 282B60 +primaryContainer 3F4178 +onPrimaryContainer E1E0FF +inversePrimary 565992 +secondary C5C4DD +onSecondary 2E2F42 +secondaryContainer 47475B +onSecondaryContainer E2E0F9 +tertiary E8B9D4 +onTertiary 46263B +tertiaryContainer AF849D +onTertiaryContainer 000000 +error FFB4AB +onError 690005 +errorContainer 93000A +onErrorContainer FFDAD6 +primaryFixed E1E0FF +primaryFixedDim BFC1FF +onPrimaryFixed 12144B +onPrimaryFixedVariant 3F4178 +secondaryFixed E2E0F9 +secondaryFixedDim C5C4DD +onSecondaryFixed 191A2C +onSecondaryFixedVariant 454559 +tertiaryFixed FFD8ED +tertiaryFixedDim E8B9D4 +onTertiaryFixed 2E1125 +onTertiaryFixedVariant 5F3C52 \ No newline at end of file diff --git a/src/caelestia/subcommands/scheme.py b/src/caelestia/subcommands/scheme.py index e149d13..973cfce 100644 --- a/src/caelestia/subcommands/scheme.py +++ b/src/caelestia/subcommands/scheme.py @@ -15,6 +15,7 @@ class Command: if self.args.random: scheme.set_random() + apply_colours(scheme.colours, scheme.mode) elif self.args.name or self.args.flavour or self.args.mode: if self.args.name: scheme.name = self.args.name diff --git a/src/caelestia/utils/material/generator.py b/src/caelestia/utils/material/generator.py index 33ff0e8..235b2ce 100755 --- a/src/caelestia/utils/material/generator.py +++ b/src/caelestia/utils/material/generator.py @@ -187,6 +187,6 @@ def gen_scheme(scheme, primary: Hct, colours: list[Hct]) -> dict[str, str]: colours["success"] = harmonize(base[8], primary) # For debugging - print("\n".join(["{}: \x1b[48;2;{};{};{}m \x1b[0m".format(n, *c.to_rgba()[:3]) for n, c in colours.items()])) + # print("\n".join(["{}: \x1b[48;2;{};{};{}m \x1b[0m".format(n, *c.to_rgba()[:3]) for n, c in colours.items()])) return {k: hex(v.to_int())[4:] for k, v in colours.items()} diff --git a/src/caelestia/utils/scheme.py b/src/caelestia/utils/scheme.py index 66cd697..ce8d6fe 100644 --- a/src/caelestia/utils/scheme.py +++ b/src/caelestia/utils/scheme.py @@ -1,4 +1,5 @@ import json +import random from pathlib import Path from caelestia.utils.material import get_colours_for_image @@ -106,6 +107,13 @@ class Scheme: f, ) + def set_random(self) -> None: + self._name = random.choice(get_scheme_names()) + self._flavour = random.choice(get_scheme_flavours()) + self._mode = random.choice(get_scheme_modes()) + self._update_colours() + self.save() + def _check_flavour(self) -> None: global scheme_flavours scheme_flavours = None -- cgit v1.2.3-freya From e75e727262573de25ee1e1e75bd93e3647dc3609 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Thu, 12 Jun 2025 16:23:14 +1000 Subject: scheme: add variant option Remove variant subcommand --- src/caelestia/parser.py | 22 ++-------------------- src/caelestia/subcommands/scheme.py | 4 +++- src/caelestia/subcommands/variant.py | 11 ----------- src/caelestia/utils/scheme.py | 5 +++++ 4 files changed, 10 insertions(+), 32 deletions(-) delete mode 100644 src/caelestia/subcommands/variant.py (limited to 'src/caelestia/subcommands/scheme.py') diff --git a/src/caelestia/parser.py b/src/caelestia/parser.py index 9718938..3f6f506 100644 --- a/src/caelestia/parser.py +++ b/src/caelestia/parser.py @@ -1,18 +1,6 @@ import argparse -from caelestia.subcommands import ( - clipboard, - emoji, - pip, - record, - scheme, - screenshot, - shell, - toggle, - variant, - wallpaper, - wsaction, -) +from caelestia.subcommands import clipboard, emoji, pip, record, scheme, screenshot, shell, toggle, wallpaper, wsaction from caelestia.utils.scheme import get_scheme_names, scheme_variants @@ -65,13 +53,7 @@ def parse_args() -> (argparse.ArgumentParser, argparse.Namespace): scheme_parser.add_argument("-n", "--name", choices=get_scheme_names(), help="the name of the scheme to switch to") scheme_parser.add_argument("-f", "--flavour", help="the flavour to switch to") scheme_parser.add_argument("-m", "--mode", choices=["dark", "light"], help="the mode to switch to") - - # Create parser for variant opts - variant_parser = command_parser.add_parser("variant", help="manage the dynamic scheme variant") - variant_parser.set_defaults(cls=variant.Command) - variant_parser.add_argument("-g", "--get", action="store_true", help="print the current dynamic scheme variant") - variant_parser.add_argument("-s", "--set", choices=scheme_variants, help="set the current dynamic scheme variant") - variant_parser.add_argument("-r", "--random", action="store_true", help="switch to a random variant") + scheme_parser.add_argument("-v", "--variant", choices=scheme_variants, help="the variant to switch to") # Create parser for screenshot opts screenshot_parser = command_parser.add_parser("screenshot", help="take a screenshot") diff --git a/src/caelestia/subcommands/scheme.py b/src/caelestia/subcommands/scheme.py index 973cfce..c95df96 100644 --- a/src/caelestia/subcommands/scheme.py +++ b/src/caelestia/subcommands/scheme.py @@ -16,13 +16,15 @@ class Command: if self.args.random: scheme.set_random() apply_colours(scheme.colours, scheme.mode) - elif self.args.name or self.args.flavour or self.args.mode: + elif self.args.name or self.args.flavour or self.args.mode or self.args.variant: if self.args.name: scheme.name = self.args.name if self.args.flavour: scheme.flavour = self.args.flavour if self.args.mode: scheme.mode = self.args.mode + if self.args.variant: + scheme.variant = self.args.variant apply_colours(scheme.colours, scheme.mode) else: print(scheme) diff --git a/src/caelestia/subcommands/variant.py b/src/caelestia/subcommands/variant.py deleted file mode 100644 index 37f9a2b..0000000 --- a/src/caelestia/subcommands/variant.py +++ /dev/null @@ -1,11 +0,0 @@ -from argparse import Namespace - - -class Command: - args: Namespace - - def __init__(self, args: Namespace) -> None: - self.args = args - - def run(self) -> None: - pass diff --git a/src/caelestia/utils/scheme.py b/src/caelestia/utils/scheme.py index f25cf62..c978231 100644 --- a/src/caelestia/utils/scheme.py +++ b/src/caelestia/utils/scheme.py @@ -84,7 +84,12 @@ class Scheme: @variant.setter def variant(self, variant: str) -> None: + if variant == self._variant: + return + self._variant = variant + self._update_colours() + self.save() @property def colours(self) -> dict[str, str]: -- cgit v1.2.3-freya