fix: waybar extra style
This commit is contained in:
parent
2407945ef5
commit
188882e8ad
1 changed files with 10 additions and 3 deletions
|
|
@ -487,10 +487,10 @@
|
||||||
'';
|
'';
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
# SELECT PRESET
|
# BASE STYLE
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
selectedStyle =
|
baseStyle =
|
||||||
if cfg.style.preset == "default"
|
if cfg.style.preset == "default"
|
||||||
then defaultStyle
|
then defaultStyle
|
||||||
else if cfg.style.preset == "translucent"
|
else if cfg.style.preset == "translucent"
|
||||||
|
|
@ -498,8 +498,15 @@
|
||||||
else if cfg.style.preset == "opaque"
|
else if cfg.style.preset == "opaque"
|
||||||
then opaqueStyle
|
then opaqueStyle
|
||||||
else "";
|
else "";
|
||||||
|
|
||||||
|
############################################################
|
||||||
|
# FINAL STYLE
|
||||||
|
############################################################
|
||||||
|
|
||||||
|
finalStyle = baseStyle + cfg.style.extra;
|
||||||
in {
|
in {
|
||||||
programs.waybar = lib.mkIf (cfg.enable && cfg.style.preset != "none") {
|
programs.waybar = lib.mkIf (cfg.enable && cfg.style.preset != "none") {
|
||||||
style = selectedStyle + "\n" + cfg.style.extra;
|
enable = true;
|
||||||
|
style = finalStyle;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue