Style: Rename to camelCase.

This commit is contained in:
Dmitry Voronin 2024-11-23 07:44:51 +03:00
parent 31634c6e69
commit 58f7236ff3
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
6 changed files with 32 additions and 36 deletions

View file

@ -5,7 +5,7 @@
}: { }: {
config = (pkgs.formats.ini { }).generate "SwappyConfig" { config = (pkgs.formats.ini { }).generate "SwappyConfig" {
Default = { Default = {
custom_color = with config.module.style.color; "rgba(${accent-r},${accent-g},${accent-b},1)"; custom_color = with config.module.style.color; "rgba(${accentR},${accentG},${accentB},1)";
early_exit = true; early_exit = true;
fill_shape = false; fill_shape = false;
line_size = 4; line_size = 4;

View file

@ -51,7 +51,7 @@ in {
#scratchpad:hover, #scratchpad:hover,
#tray:hover, #tray:hover,
#workspaces button:hover { #workspaces button:hover {
background-color: rgba(${config.module.style.color.border-r},${config.module.style.color.border-g},${config.module.style.color.border-b},${toString config.module.style.opacity.desktop}); background-color: rgba(${config.module.style.color.borderR},${config.module.style.color.borderG},${config.module.style.color.borderB},${toString config.module.style.opacity.desktop});
} }
/* Critical state. */ /* Critical state. */

View file

@ -4,8 +4,8 @@
}: { }: {
text = '' text = ''
window#waybar { window#waybar {
background-color: rgba(${config.module.style.color.bg-r},${config.module.style.color.bg-g},${config.module.style.color.bg-b},${toString config.module.style.opacity.desktop}); background-color: rgba(${config.module.style.color.bgR},${config.module.style.color.bgG},${config.module.style.color.bgB},${toString config.module.style.opacity.desktop});
border: ${toString config.module.style.window.border}px solid rgba(${config.module.style.color.border-r},${config.module.style.color.border-g},${config.module.style.color.border-b},${toString config.module.style.opacity.desktop}); border: ${toString config.module.style.window.border}px solid rgba(${config.module.style.color.borderR},${config.module.style.color.borderG},${config.module.style.color.borderB},${toString config.module.style.opacity.desktop});
} }
.modules-left > widget:first-child > #workspaces { .modules-left > widget:first-child > #workspaces {

View file

@ -2,10 +2,10 @@
config, config,
... ...
}: let }: let
accent = "${config.module.style.color.accent-r};${config.module.style.color.accent-g};${config.module.style.color.accent-b}"; accent = "${config.module.style.color.accentR};${config.module.style.color.accentG};${config.module.style.color.accentB}";
negative = "${config.module.style.color.negative-r};${config.module.style.color.negative-g};${config.module.style.color.negative-b}"; negative = "${config.module.style.color.negativeR};${config.module.style.color.negativeG};${config.module.style.color.negativeB}";
neutral = "${config.module.style.color.neutral-r};${config.module.style.color.neutral-g};${config.module.style.color.neutral-b}"; neutral = "${config.module.style.color.neutralR};${config.module.style.color.neutralG};${config.module.style.color.neutralB}";
positive = "${config.module.style.color.positive-r};${config.module.style.color.positive-g};${config.module.style.color.positive-b}"; positive = "${config.module.style.color.positiveR};${config.module.style.color.positiveG};${config.module.style.color.positiveB}";
in { in {
text = '' text = ''
export PROMPT_COMMAND=(__prompt_command "''${PROMPT_COMMAND[@]}") export PROMPT_COMMAND=(__prompt_command "''${PROMPT_COMMAND[@]}")

View file

@ -38,38 +38,34 @@ in {
regular = mkStrOption stylix.colors.base05; regular = mkStrOption stylix.colors.base05;
}; };
accent-r = mkStrOption stylix.colors.base0A-rgb-r; accentR = mkStrOption stylix.colors.base0A-rgb-r;
accent-g = mkStrOption stylix.colors.base0A-rgb-g; accentG = mkStrOption stylix.colors.base0A-rgb-g;
accent-b = mkStrOption stylix.colors.base0A-rgb-b; accentB = mkStrOption stylix.colors.base0A-rgb-b;
accent-dec-r = mkStrOption stylix.colors.base0A-dec-r; accentDecR = mkStrOption stylix.colors.base0A-dec-r;
accent-dec-g = mkStrOption stylix.colors.base0A-dec-g; accentDecG = mkStrOption stylix.colors.base0A-dec-g;
accent-dec-b = mkStrOption stylix.colors.base0A-dec-b; accentDecB = mkStrOption stylix.colors.base0A-dec-b;
bg-r = mkStrOption stylix.colors.base00-rgb-r; bgR = mkStrOption stylix.colors.base00-rgb-r;
bg-g = mkStrOption stylix.colors.base00-rgb-g; bgG = mkStrOption stylix.colors.base00-rgb-g;
bg-b = mkStrOption stylix.colors.base00-rgb-b; bgB = mkStrOption stylix.colors.base00-rgb-b;
border = mkStrOption stylix.colors.base01; border = mkStrOption stylix.colors.base01;
border-r = mkStrOption stylix.colors.base01-rgb-r; borderR = mkStrOption stylix.colors.base01-rgb-r;
border-g = mkStrOption stylix.colors.base01-rgb-g; borderG = mkStrOption stylix.colors.base01-rgb-g;
border-b = mkStrOption stylix.colors.base01-rgb-b; borderB = mkStrOption stylix.colors.base01-rgb-b;
fg-r = mkStrOption stylix.colors.base06-rgb-r; negativeR = mkStrOption stylix.colors.base08-rgb-r;
fg-g = mkStrOption stylix.colors.base06-rgb-g; negativeG = mkStrOption stylix.colors.base08-rgb-g;
fg-b = mkStrOption stylix.colors.base06-rgb-b; negativeB = mkStrOption stylix.colors.base08-rgb-b;
negative-r = mkStrOption stylix.colors.base08-rgb-r; neutralR = mkStrOption stylix.colors.base0C-rgb-r;
negative-g = mkStrOption stylix.colors.base08-rgb-g; neutralG = mkStrOption stylix.colors.base0C-rgb-g;
negative-b = mkStrOption stylix.colors.base08-rgb-b; neutralB = mkStrOption stylix.colors.base0C-rgb-b;
neutral-r = mkStrOption stylix.colors.base0C-rgb-r; positiveR = mkStrOption stylix.colors.base0B-rgb-r;
neutral-g = mkStrOption stylix.colors.base0C-rgb-g; positiveG = mkStrOption stylix.colors.base0B-rgb-g;
neutral-b = mkStrOption stylix.colors.base0C-rgb-b; positiveB = mkStrOption stylix.colors.base0B-rgb-b;
positive-r = mkStrOption stylix.colors.base0B-rgb-r;
positive-g = mkStrOption stylix.colors.base0B-rgb-g;
positive-b = mkStrOption stylix.colors.base0B-rgb-b;
transparent = mkStrOption "ffffff00"; transparent = mkStrOption "ffffff00";
}; };

View file

@ -4,9 +4,9 @@
... ...
}: let }: let
color = config.module.style.color; color = config.module.style.color;
accentR = color.accent-dec-r; accentR = color.accentDecR;
accentG = color.accent-dec-g; accentG = color.accentDecG;
accentB = color.accent-dec-b; accentB = color.accentDecB;
in { in {
file = pkgs.writeText "SwappyDefaultColorPatch" '' file = pkgs.writeText "SwappyDefaultColorPatch" ''
diff --git a/src/application.c b/src/application.c diff --git a/src/application.c b/src/application.c