1

Modules/Color: Don't specify light/dark schemes, choose a single scheme where everything is based on

This commit is contained in:
2025-07-19 19:23:17 +02:00
parent 3daefbad68
commit f62f7b4c64
11 changed files with 248 additions and 284 deletions

View File

@ -7,7 +7,7 @@
nixosConfig,
...
}: let
inherit (config.modules) hyprland color waybar;
inherit (config.modules) hyprland color;
always-bind = lib.mergeAttrsList [
{
@ -203,11 +203,11 @@ in {
enable = true;
settings = {
options = {
background = "${color.hex.dark.text}";
background = "${color.hex.text}";
overlay = true;
overlay_font = "${color.font}:12";
overlay_text_color = "${color.hex.dark.text}";
overlay_background_color = "${color.hex.dark.base}";
overlay_text_color = "${color.hex.text}";
overlay_background_color = "${color.hex.base}";
};
};
};
@ -242,12 +242,12 @@ in {
monitor = "";
dots_center = true;
fade_on_empty = false;
font_color = "rgb(${color.hex.dark.base})";
font_color = "rgb(${color.hex.base})";
font_family = "${color.font}";
inner_color = "rgb(${color.hex.dark.lavender})";
outer_color = "rgb(${color.hex.dark.base})";
inner_color = "rgb(${color.hex.lavender})";
outer_color = "rgb(${color.hex.base})";
outline_thickness = 2;
placeholder_text = "<span foreground='\#\#${color.hex.dark.base}'>Password...</span>";
placeholder_text = "<span foreground='\#\#${color.hex.base}'>Password...</span>";
shadow_passes = 0;
rounding = 5;
halign = "center";
@ -261,7 +261,7 @@ in {
position = "0, 300";
monitor = "";
text = ''cmd[update:1000] date -I'';
color = "rgba(${color.hex.dark.text}AA)";
color = "rgba(${color.hex.text}AA)";
font_size = 22;
font_family = "${color.font}";
halign = "center";
@ -273,7 +273,7 @@ in {
position = "0, 200";
monitor = "";
text = ''cmd[update:1000] date +"%-H:%M"'';
color = "rgba(${color.hex.dark.text}AA)";
color = "rgba(${color.hex.text}AA)";
font_size = 95;
font_family = "${color.font} Extrabold";
halign = "center";
@ -339,26 +339,26 @@ in {
settings = {
global = {
monitor = waybar.monitor;
monitor = config.modules.waybar.monitor;
font = "${color.font} 11";
offset = "10x10";
background = "#${color.hex.light.base}";
foreground = "#${color.hex.light.text}";
background = "#${color.hex.base}";
foreground = "#${color.hex.text}";
frame_width = 2;
corner_radius = 5;
separator_color = "frame";
};
urgency_low = {
frame_color = "#${color.hex.light.green}";
frame_color = "#${color.hex.green}";
};
urgency_normal = {
frame_color = "#${color.hex.light.green}";
frame_color = "#${color.hex.green}";
};
urgency_critical = {
frame_color = "#${color.hex.light.red}";
frame_color = "#${color.hex.red}";
};
};
};
@ -386,8 +386,8 @@ in {
gaps_out = 10;
border_size = 2;
"col.active_border" = "rgb(${color.hex.dark.lavender})";
"col.inactive_border" = "rgba(${color.hex.dark.base}AA)";
"col.active_border" = "rgb(${color.hex.lavender})";
"col.inactive_border" = "rgba(${color.hex.base}AA)";
};
group = {
@ -397,12 +397,12 @@ in {
font_size = 10;
gradients = false;
"col.active" = "rgb(${color.hex.dark.lavender})";
"col.inactive" = "rgba(${color.hex.dark.base}AA)";
"col.active" = "rgb(${color.hex.lavender})";
"col.inactive" = "rgba(${color.hex.base}AA)";
};
"col.border_active" = "rgb(${color.hex.dark.lavender})";
"col.border_inactive" = "rgba(${color.hex.dark.base}AA)";
"col.border_active" = "rgb(${color.hex.lavender})";
"col.border_inactive" = "rgba(${color.hex.base}AA)";
};
input = {