From 4977cf16285e2fee8f125724a3a1b7edaa5a8867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Thu, 4 May 2023 23:57:36 -0300 Subject: [PATCH] move style stuff to style attribute --- user/waybar/default.nix | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/user/waybar/default.nix b/user/waybar/default.nix index bc69e2b..3127357 100644 --- a/user/waybar/default.nix +++ b/user/waybar/default.nix @@ -2,22 +2,6 @@ let inherit (pkgs.uservars) key theme accent font; inherit (theme) color; - - cssVariables = { - src = ./style.css; - - accent_color = accent.color; - - color_bg = color.bg; - color_bg_dark = color.bg_dark; - color_bg_light = color.bg_light; - color_txt = color.txt; - - font_interface = font.interface; - - font_size_big = "${toString font.size.big}px"; - font_size_medium = "${toString font.size.medium}px"; - }; in { config = { @@ -161,7 +145,21 @@ in on-click-right = "${pkgs.pulse_sink}/bin/pulse_sink"; }; }]; - style = builtins.readFile (pkgs.substituteAll cssVariables); + style = builtins.readFile (pkgs.substituteAll { + src = ./style.css; + + accent_color = accent.color; + + color_bg = color.bg; + color_bg_dark = color.bg_dark; + color_bg_light = color.bg_light; + color_txt = color.txt; + + font_interface = font.interface; + + font_size_big = "${toString font.size.big}px"; + font_size_medium = "${toString font.size.medium}px"; + }); }; home.packages = with pkgs; [ waybar ]; };