From 6b2b0fd545d5ff0854af3f1c740ef3231af342cb Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 13 Feb 2026 14:14:04 +0100 Subject: [PATCH] push --- Colors.qml | 152 ++++++++++++++++++++++++------------------- templates/Colors.qml | 114 ++++++++++---------------------- wallust.toml | 10 ++- 3 files changed, 125 insertions(+), 151 deletions(-) diff --git a/Colors.qml b/Colors.qml index beeb0d3..fb5a7b3 100644 --- a/Colors.qml +++ b/Colors.qml @@ -5,87 +5,105 @@ import Quickshell Singleton { id: customColors + // --- Base16 Colors --- + readonly property color base00: "{{background}}" + readonly property color base01: "{{color0}}" + readonly property color base02: "{{color8}}" + readonly property color base03: "{{color8}}" + readonly property color base04: "{{color7}}" + readonly property color base05: "{{foreground}}" + readonly property color base06: "{{color15}}" + readonly property color base07: "{{color15}}" + readonly property color base08: "{{color1}}" + readonly property color base09: "{{color3}}" + readonly property color base0A: "{{color3}}" + readonly property color base0B: "{{color2}}" + readonly property color base0C: "{{color6}}" + readonly property color base0D: "{{color4}}" + readonly property color base0E: "{{color5}}" + readonly property color base0F: "{{color5}}" + // --- Core Colors --- - readonly property color primary: "{{colors.primary.default.hex}}" - readonly property color onPrimaryColor: "{{colors.on_primary.default.hex}}" - readonly property color primaryContainer: "{{colors.primary_container.default.hex}}" - readonly property color onPrimaryContainerColor: "{{colors.on_primary_container.default.hex}}" - readonly property color inversePrimary: "{{colors.inverse_primary.default.hex}}" + readonly property color primary: "{{color2}}" + readonly property color onPrimaryColor: "{{background}}" + readonly property color primaryContainer: "{{color10}}" + readonly property color onPrimaryContainerColor: "{{background}}" + readonly property color inversePrimary: "{{color10}}" - readonly property color secondary: "{{colors.secondary.default.hex}}" - readonly property color onSecondaryColor: "{{colors.on_secondary.default.hex}}" - readonly property color secondaryContainer: "{{colors.secondary_container.default.hex}}" - readonly property color onSecondaryContainerColor: "{{colors.on_secondary_container.default.hex}}" + readonly property color secondary: "{{color4}}" + readonly property color onSecondaryColor: "{{background}}" + readonly property color secondaryContainer: "{{color12}}" + readonly property color onSecondaryContainerColor: "{{background}}" - readonly property color tertiary: "{{colors.tertiary.default.hex}}" - readonly property color onTertiaryColor: "{{colors.on_tertiary.default.hex}}" - readonly property color tertiaryContainer: "{{colors.tertiary_container.default.hex}}" - readonly property color onTertiaryContainerColor: "{{colors.on_tertiary_container.default.hex}}" + readonly property color tertiary: "{{color3}}" + readonly property color onTertiaryColor: "{{background}}" + readonly property color tertiaryContainer: "{{color11}}" + readonly property color onTertiaryContainerColor: "{{background}}" - readonly property color error: "{{colors.error.default.hex}}" - readonly property color onErrorColor: "{{colors.on_error.default.hex}}" - readonly property color errorContainer: "{{colors.error_container.default.hex}}" - readonly property color onErrorContainerColor: "{{colors.on_error_container.default.hex}}" + readonly property color error: "{{color1}}" + readonly property color onErrorColor: "{{background}}" + readonly property color errorContainer: "{{color9}}" + readonly property color onErrorContainerColor: "{{background}}" - readonly property color background: "{{colors.background.default.hex}}" - readonly property color onBackgroundColor: "{{colors.on_background.default.hex}}" + readonly property color background: "{{background}}" + readonly property color onBackgroundColor: "{{foreground}}" // --- Surfaces --- - readonly property color surface: "{{colors.surface.default.hex}}" - readonly property color onSurfaceColor: "{{colors.on_surface.default.hex}}" - readonly property color surfaceVariant: "{{colors.surface_variant.default.hex}}" - readonly property color onSurfaceVariantColor: "{{colors.on_surface_variant.default.hex}}" - readonly property color inverseSurface: "{{colors.inverse_surface.default.hex}}" - readonly property color inverseOnSurface: "{{colors.inverse_on_surface.default.hex}}" + readonly property color surface: "{{background}}" + readonly property color onSurfaceColor: "{{foreground}}" + readonly property color surfaceVariant: "{{color8}}" + readonly property color onSurfaceVariantColor: "{{color15}}" + readonly property color inverseSurface: "{{foreground}}" + readonly property color inverseOnSurface: "{{background}}" - readonly property color surfaceDim: "{{colors.surface_dim.default.hex}}" - readonly property color surfaceBright: "{{colors.surface_bright.default.hex}}" - readonly property color surfaceContainerLowest: "{{colors.surface_container_lowest.default.hex}}" - readonly property color surfaceContainerLow: "{{colors.surface_container_low.default.hex}}" - readonly property color surfaceContainer: "{{colors.surface_container.default.hex}}" - readonly property color surfaceContainerHigh: "{{colors.surface_container_high.default.hex}}" - readonly property color surfaceContainerHighest: "{{colors.surface_container_highest.default.hex}}" + readonly property color surfaceDim: "{{background}}" + readonly property color surfaceBright: "{{color8}}" + readonly property color surfaceContainerLowest: "{{background}}" + readonly property color surfaceContainerLow: "{{color0}}" + readonly property color surfaceContainer: "{{background}}" + readonly property color surfaceContainerHigh: "{{color8}}" + readonly property color surfaceContainerHighest: "{{color8}}" // --- Outlines & Shadows --- - readonly property color outline: "{{colors.outline.default.hex}}" - readonly property color outlineVariant: "{{colors.outline_variant.default.hex}}" - readonly property color shadow: "{{colors.shadow.default.hex}}" - readonly property color scrim: "{{colors.scrim.default.hex}}" + readonly property color outline: "{{color15}}" + readonly property color outlineVariant: "{{color8}}" + readonly property color shadow: "#000000" + readonly property color scrim: "#000000" - // --- Fixed Colors (useful for things that shouldn't change drastically in dark mode) --- - readonly property color primaryFixed: "{{colors.primary_fixed.default.hex}}" - readonly property color primaryFixedDim: "{{colors.primary_fixed_dim.default.hex}}" - readonly property color onPrimaryFixedColor: "{{colors.on_primary_fixed.default.hex}}" - readonly property color onPrimaryFixedVariant: "{{colors.on_primary_fixed_variant.default.hex}}" + // --- Fixed Colors --- + readonly property color primaryFixed: "{{color2}}" + readonly property color primaryFixedDim: "{{color10}}" + readonly property color onPrimaryFixedColor: "{{background}}" + readonly property color onPrimaryFixedVariant: "{{color2}}" - readonly property color secondaryFixed: "{{colors.secondary_fixed.default.hex}}" - readonly property color secondaryFixedDim: "{{colors.secondary_fixed_dim.default.hex}}" - readonly property color onSecondaryFixedColor: "{{colors.on_secondary_fixed.default.hex}}" - readonly property color onSecondaryFixedVariant: "{{colors.on_secondary_fixed_variant.default.hex}}" + readonly property color secondaryFixed: "{{color4}}" + readonly property color secondaryFixedDim: "{{color12}}" + readonly property color onSecondaryFixedColor: "{{background}}" + readonly property color onSecondaryFixedVariant: "{{color4}}" - readonly property color tertiaryFixed: "{{colors.tertiary_fixed.default.hex}}" - readonly property color tertiaryFixedDim: "{{colors.tertiary_fixed_dim.default.hex}}" - readonly property color onTertiaryFixedColor: "{{colors.on_tertiary_fixed.default.hex}}" - readonly property color onTertiaryFixedVariant: "{{colors.on_tertiary_fixed_variant.default.hex}}" + readonly property color tertiaryFixed: "{{color3}}" + readonly property color tertiaryFixedDim: "{{color11}}" + readonly property color onTertiaryFixedColor: "{{background}}" + readonly property color onTertiaryFixedVariant: "{{color3}}" - // --- Legacy / Terminal Mappings (color0 - color15) --- - readonly property color color0: "{{colors.surface.default.hex}}" - readonly property color color1: "{{colors.error.default.hex}}" - readonly property color color2: "{{colors.primary.default.hex}}" - readonly property color color3: "{{colors.tertiary.default.hex}}" - readonly property color color4: "{{colors.secondary.default.hex}}" - readonly property color color5: "{{colors.primary_container.default.hex}}" - readonly property color color6: "{{colors.secondary_container.default.hex}}" - readonly property color color7: "{{colors.on_surface.default.hex}}" - readonly property color color8: "{{colors.surface_variant.default.hex}}" - readonly property color color9: "{{colors.error_container.default.hex}}" - readonly property color color10: "{{colors.inverse_primary.default.hex}}" - readonly property color color11: "{{colors.on_tertiary_container.default.hex}}" - readonly property color color12: "{{colors.on_secondary_container.default.hex}}" - readonly property color color13: "{{colors.on_primary_container.default.hex}}" - readonly property color color14: "{{colors.on_surface_variant.default.hex}}" - readonly property color color15: "{{colors.inverse_surface.default.hex}}" + // --- Legacy / Terminal Mappings --- + readonly property color color0: "{{color0}}" + readonly property color color1: "{{color1}}" + readonly property color color2: "{{color2}}" + readonly property color color3: "{{color3}}" + readonly property color color4: "{{color4}}" + readonly property color color5: "{{color5}}" + readonly property color color6: "{{color6}}" + readonly property color color7: "{{color7}}" + readonly property color color8: "{{color8}}" + readonly property color color9: "{{color9}}" + readonly property color color10: "{{color10}}" + readonly property color color11: "{{color11}}" + readonly property color color12: "{{color12}}" + readonly property color color13: "{{color13}}" + readonly property color color14: "{{color14}}" + readonly property color color15: "{{color15}}" // Helper alias for common needs - readonly property color cursor: primary + readonly property color cursor: base05 } diff --git a/templates/Colors.qml b/templates/Colors.qml index ab03108..c8bfc7d 100644 --- a/templates/Colors.qml +++ b/templates/Colors.qml @@ -5,89 +5,47 @@ import Quickshell Singleton { id: customColors - // --- Core Colors --- - // Mapping specific Wallust terminal colors to UI roles - // Adjust these numbers (color4, color5) if you want different accent colors! - readonly property color primary: "{{color4}}" - readonly property color onPrimaryColor: "{{background}}" - readonly property color primaryContainer: "{{color12}}" - readonly property color onPrimaryContainerColor: "{{background}}" - readonly property color inversePrimary: "{{color4}}" + // --- Base16 Colors --- + readonly property color base00: "{{background}}" + readonly property color base01: "{{color0}}" + readonly property color base02: "{{color2}}" + readonly property color base03: "{{color3}}" + readonly property color base04: "{{color4}}" + readonly property color base05: "{{color5}}" + readonly property color base06: "{{color6}}" + readonly property color base07: "{{color7}}" + readonly property color base08: "{{color8}}" + readonly property color base09: "{{color9}}" + readonly property color base0A: "{{color10}}" + readonly property color base0B: "{{color11}}" + readonly property color base0C: "{{color12}}" + readonly property color base0D: "{{color13}}" + readonly property color base0E: "{{color14}}" + readonly property color base0F: "{{color15}}" - readonly property color secondary: "{{color5}}" - readonly property color onSecondaryColor: "{{background}}" - readonly property color secondaryContainer: "{{color13}}" - readonly property color onSecondaryContainerColor: "{{background}}" + // --- Aliases for compatibility --- + readonly property color primary: base0D + readonly property color onPrimaryColor: base00 + readonly property color primaryContainer: base0D + readonly property color onPrimaryContainerColor: base00 - readonly property color tertiary: "{{color6}}" - readonly property color onTertiaryColor: "{{background}}" - readonly property color tertiaryContainer: "{{color14}}" - readonly property color onTertiaryContainerColor: "{{background}}" + readonly property color secondary: base0E + readonly property color onSecondaryColor: base00 - readonly property color error: "{{color1}}" - readonly property color onErrorColor: "{{background}}" - readonly property color errorContainer: "{{color9}}" - readonly property color onErrorContainerColor: "{{foreground}}" + readonly property color surface: base00 + readonly property color onSurfaceColor: base05 + readonly property color surfaceVariant: base02 + readonly property color onSurfaceVariantColor: base04 - readonly property color background: "{{background}}" - readonly property color onBackgroundColor: "{{foreground}}" + readonly property color surfaceContainerLowest: base00 + readonly property color surfaceContainerLow: base01 + readonly property color surfaceContainer: base01 + readonly property color surfaceContainerHigh: base02 + readonly property color surfaceContainerHighest: base03 - // --- Surfaces --- - readonly property color surface: "{{background}}" - readonly property color onSurfaceColor: "{{foreground}}" - readonly property color surfaceVariant: "{{color0}}" - readonly property color onSurfaceVariantColor: "{{color7}}" - readonly property color inverseSurface: "{{foreground}}" - readonly property color inverseOnSurface: "{{background}}" - - readonly property color surfaceDim: "{{color0}}" - readonly property color surfaceBright: "{{color8}}" - readonly property color surfaceContainerLowest: "{{background}}" - readonly property color surfaceContainerLow: "{{color0}}" - readonly property color surfaceContainer: "{{color0}}" - readonly property color surfaceContainerHigh: "{{color8}}" - readonly property color surfaceContainerHighest: "{{color8}}" - - // --- Outlines & Shadows --- - readonly property color outline: "{{color8}}" - readonly property color outlineVariant: "{{color8}}" - readonly property color shadow: "{{color0}}" - readonly property color scrim: "{{color0}}" - - // --- Fixed Colors --- - readonly property color primaryFixed: "{{color4}}" - readonly property color primaryFixedDim: "{{color4}}" - readonly property color onPrimaryFixedColor: "{{background}}" - readonly property color onPrimaryFixedVariant: "{{color4}}" - - readonly property color secondaryFixed: "{{color5}}" - readonly property color secondaryFixedDim: "{{color5}}" - readonly property color onSecondaryFixedColor: "{{background}}" - readonly property color onSecondaryFixedVariant: "{{color5}}" - - readonly property color tertiaryFixed: "{{color6}}" - readonly property color tertiaryFixedDim: "{{color6}}" - readonly property color onTertiaryFixedColor: "{{background}}" - readonly property color onTertiaryFixedVariant: "{{color6}}" - - // --- Legacy / Terminal Mappings --- - readonly property color color0: "{{color0}}" - readonly property color color1: "{{color1}}" - readonly property color color2: "{{color2}}" - readonly property color color3: "{{color3}}" - readonly property color color4: "{{color4}}" - readonly property color color5: "{{color5}}" - readonly property color color6: "{{color6}}" - readonly property color color7: "{{color7}}" - readonly property color color8: "{{color8}}" - readonly property color color9: "{{color9}}" - readonly property color color10: "{{color10}}" - readonly property color color11: "{{color11}}" - readonly property color color12: "{{color12}}" - readonly property color color13: "{{color13}}" - readonly property color color14: "{{color14}}" - readonly property color color15: "{{color15}}" + readonly property color outline: base03 + readonly property color error: base08 // Helper alias - readonly property color cursor: "{{cursor}}" + readonly property color cursor: base05 } diff --git a/wallust.toml b/wallust.toml index 8b54cb8..77da371 100644 --- a/wallust.toml +++ b/wallust.toml @@ -11,11 +11,11 @@ # How the image is parse, in order to get the colors: # full - resized - wal - thumb - fastresize - kmeans -backend = "fastresize" +backend = "full" # What color space to use to produce and select the most prominent colors: # lab - labmixed - lch - lchmixed -color_space = "lch" +color_space = "lchmixed" # Use the most prominent colors in a way that makes sense, a scheme color palette: # dark - dark16 - darkcomp - darkcomp16 @@ -25,15 +25,15 @@ color_space = "lch" # softlight - softlight16 - softlightcomp - softlightcomp16 palette = "dark" + # Ensures a "readable contrast" (OPTIONAL, disabled by default) # Should only be enabled when you notice an unreadable contrast frequently happening # with your images. The reference color for the contrast is the background color. -check_contrast = true # Color saturation, between [1% and 100%] (OPTIONAL, disabled by default) # usually something higher than 50 increases the saturation and below # decreases it (on a scheme with strong and vivid colors) -saturation = 55 +saturation = 70 # Alpha value for templating, by default 100 (no other use whatsoever) #alpha = 100 @@ -44,8 +44,6 @@ saturation = 55 # target: ABSOLUTE path in which to place a file with generated templated values. # ยก If either one is a directory, then both SHOULD be one. ! # zathura = { template = 'zathura', target = '~/.config/zathura/zathurarc' } -foot = { template = 'foot.ini', target = '~/.config/foot/colors.ini' } -waybar = { template = 'waybar.css', target = '~/.config/waybar/colors.css' } nvim = { template = 'nvim.lua', target = '~/.config/nvim/colors/wallust.lua' } gtk3 = { template = 'gtk.css', target = '~/.config/gtk-3.0/colors.css' } gtk4 = { template = 'gtk.css', target = '~/.config/gtk-4.0/colors.css' }