theme: borderRadius -> borders.radius

This commit is contained in:
Aly Raffauf 2024-08-15 18:31:07 -04:00
parent 659d26148a
commit 38ce53c779
10 changed files with 21 additions and 19 deletions

View file

@ -10,7 +10,7 @@ in {
enable = true; enable = true;
settings = { settings = {
border = { border = {
radius = cfg.theme.borderRadius; radius = cfg.theme.borders.radius;
width = 4; width = 4;
}; };

View file

@ -89,7 +89,7 @@ in {
background-color = mkLiteral "@background"; background-color = mkLiteral "@background";
border = 4; border = 4;
border-color = mkLiteral "@blue"; border-color = mkLiteral "@blue";
border-radius = mkLiteral "${toString cfg.theme.borderRadius}"; border-radius = mkLiteral "${toString cfg.theme.borders.radius}";
}; };
message = { message = {

View file

@ -118,7 +118,7 @@ in {
"ignorezero,waybar" "ignorezero,waybar"
]; ];
rounding = cfg.theme.borderRadius; rounding = cfg.theme.borders.radius;
shadow_range = 4; shadow_range = 4;
shadow_render_power = 3; shadow_render_power = 3;
}; };

View file

@ -256,7 +256,7 @@ in {
blur enable blur enable
blur_passes 2 blur_passes 2
# corner_radius ${toString cfg.theme.borderRadius} # corner_radius ${toString cfg.theme.borders.radius}
shadows enable shadows enable
shadows_on_csd enable shadows_on_csd enable
shadow_color ${config.lib.stylix.colors.withHashtag."base00"}CC shadow_color ${config.lib.stylix.colors.withHashtag."base00"}CC

View file

@ -201,11 +201,13 @@ in {
theme = { theme = {
enable = lib.mkEnableOption "Gtk, Qt, and application colors."; enable = lib.mkEnableOption "Gtk, Qt, and application colors.";
borderRadius = lib.mkOption { borders = {
radius = lib.mkOption {
description = "Global border radius."; description = "Global border radius.";
default = 10; default = 10;
type = lib.types.int; type = lib.types.int;
}; };
};
gtk.hideTitleBar = lib.mkOption { gtk.hideTitleBar = lib.mkOption {
description = "Whether to hide GTK3/4 titlebars (useful for some window managers)."; description = "Whether to hide GTK3/4 titlebars (useful for some window managers).";

View file

@ -10,7 +10,7 @@ in {
services.mako = { services.mako = {
actions = true; actions = true;
anchor = "bottom-right"; anchor = "bottom-right";
borderRadius = cfg.theme.borderRadius; borderRadius = cfg.theme.borders.radius;
borderSize = 4; borderSize = 4;
defaultTimeout = 10000; defaultTimeout = 10000;
enable = true; enable = true;

View file

@ -26,7 +26,7 @@ in {
text = '' text = ''
window#osd { window#osd {
padding: 12px 20px; padding: 12px 20px;
border-radius: ${toString cfg.theme.borderRadius}px; border-radius: ${toString cfg.theme.borders.radius}px;
border: 4px solid alpha(${config.lib.stylix.colors.withHashtag."base07"}, ${toString config.stylix.opacity.popups}); border: 4px solid alpha(${config.lib.stylix.colors.withHashtag."base07"}, ${toString config.stylix.opacity.popups});
background: alpha(${config.lib.stylix.colors.withHashtag."base01"}, ${toString config.stylix.opacity.popups}); background: alpha(${config.lib.stylix.colors.withHashtag."base01"}, ${toString config.stylix.opacity.popups});
} }

View file

@ -301,7 +301,7 @@ in {
} }
#workspaces button { #workspaces button {
border-radius: ${toString cfg.theme.borderRadius}; border-radius: ${toString cfg.theme.borders.radius};
} }
#workspaces button.active, #workspaces button.active,
@ -327,7 +327,7 @@ in {
#submap, #submap,
#mode { #mode {
background-color: ${config.lib.stylix.colors.withHashtag."base08"}; background-color: ${config.lib.stylix.colors.withHashtag."base08"};
border-radius: ${toString cfg.theme.borderRadius}; border-radius: ${toString cfg.theme.borders.radius};
color: ${config.lib.stylix.colors.withHashtag."base00"}; color: ${config.lib.stylix.colors.withHashtag."base00"};
font-weight: bold; font-weight: bold;
} }
@ -352,25 +352,25 @@ in {
entry { entry {
background-color: rgba (0, 0, 0, 0.2); background-color: rgba (0, 0, 0, 0.2);
border: alpha(${config.lib.stylix.colors.withHashtag."base07"}, ${toString config.stylix.opacity.popups}); border: alpha(${config.lib.stylix.colors.withHashtag."base07"}, ${toString config.stylix.opacity.popups});
border-radius: ${toString cfg.theme.borderRadius}px border-radius: ${toString cfg.theme.borders.radius}px
} }
button, image { button, image {
background: none; background: none;
border: none; border: none;
border-radius: ${toString cfg.theme.borderRadius}px border-radius: ${toString cfg.theme.borders.radius}px
} }
button:active, button:hover, button:focused { button:active, button:hover, button:focused {
background-color: alpha (${config.lib.stylix.colors.withHashtag."base05"}, 0.2); background-color: alpha (${config.lib.stylix.colors.withHashtag."base05"}, 0.2);
border: none; border: none;
border-radius: ${toString cfg.theme.borderRadius}px; border-radius: ${toString cfg.theme.borders.radius}px;
color: ${config.lib.stylix.colors.withHashtag."base0D"} color: ${config.lib.stylix.colors.withHashtag."base0D"}
} }
#category-button { #category-button {
margin: 0 10px 0 10px; margin: 0 10px 0 10px;
border-radius: ${toString cfg.theme.borderRadius}px border-radius: ${toString cfg.theme.borders.radius}px
} }
#pinned-box { #pinned-box {
@ -381,7 +381,7 @@ in {
#files-box { #files-box {
padding: 5px; padding: 5px;
border: 1px dotted gray; border: 1px dotted gray;
border-radius: ${toString cfg.theme.borderRadius}px border-radius: ${toString cfg.theme.borders.radius}px
} }
''; '';
}; };

View file

@ -37,7 +37,7 @@ in {
stylix.targets.gtk.extraCss = '' stylix.targets.gtk.extraCss = ''
// Control rounded corners // Control rounded corners
window.background { border-radius: ${toString cfg.borderRadius}; } window.background { border-radius: ${toString cfg.borders.radius}; }
${ ${
lib.strings.optionalString lib.strings.optionalString

View file

@ -115,7 +115,7 @@ self: {
theme = { theme = {
enable = true; enable = true;
borderRadius = 0; borders.radius = 0;
}; };
}; };
} }