From 638f30a67e938495adfc992aa025b4b00bf3f4ee Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:54:22 +0200 Subject: [PATCH] hyprland: inline single-use variable Link: https://github.com/danth/stylix/pull/501 --- modules/hyprland/hm.nix | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/modules/hyprland/hm.nix b/modules/hyprland/hm.nix index af05940c..4013a744 100644 --- a/modules/hyprland/hm.nix +++ b/modules/hyprland/hm.nix @@ -5,27 +5,6 @@ with config.lib.stylix.colors; let rgb = color: "rgb(${color})"; rgba = color: alpha: "rgba(${color}${alpha})"; - - settings = { - decoration.shadow.color = rgba base00 "99"; - general = { - "col.active_border" = rgb base0D; - "col.inactive_border" = rgb base03; - }; - group = { - "col.border_inactive" = rgb base03; - "col.border_active" = rgb base0D; - "col.border_locked_active" = rgb base0C; - - groupbar = { - text_color = rgb base05; - "col.active" = rgb base0D; - "col.inactive" = rgb base03; - }; - }; - misc.background_color = rgb base00; - }; - in { options.stylix.targets.hyprland = { enable = config.lib.stylix.mkEnableTarget "Hyprland" true; @@ -44,7 +23,25 @@ in { ( lib.mkMerge [ { - wayland.windowManager.hyprland.settings = settings; + wayland.windowManager.hyprland.settings = { + decoration.shadow.color = rgba base00 "99"; + general = { + "col.active_border" = rgb base0D; + "col.inactive_border" = rgb base03; + }; + group = { + "col.border_inactive" = rgb base03; + "col.border_active" = rgb base0D; + "col.border_locked_active" = rgb base0C; + + groupbar = { + text_color = rgb base05; + "col.active" = rgb base0D; + "col.inactive" = rgb base03; + }; + }; + misc.background_color = rgb base00; + }; } (