Compare commits

..

No commits in common. "c59622d0fe2d3db2619e6de25a50a6e0c8a6325c" and "90ba974f1cd445c17574961930623945e7cc44c1" have entirely different histories.

2 changed files with 9 additions and 7 deletions

View file

@ -98,7 +98,7 @@ in {
(mkIf osConfig.theme.enable (let
inherit (osConfig.theme.scheme) palette;
in {
settings.layout.focus-ring.active.color = palette.base0E;
layout.focus-ring.active.color = palette.base0E;
}))
];

View file

@ -4,16 +4,17 @@
...
}: let
inherit (osConfig.theme.scheme) palette;
inherit (lib) mapAttrsToList concatLines optionalString;
inherit (builtins) concatStringsSep;
inherit (lib) mapAttrsToList mkIf mkMerge;
generateGtkColors = palette: (concatLines
generateGtkColors = palette: (concatStringsSep "\n"
(mapAttrsToList
(name: color: "@define-color ${name} ${color};")
palette));
in {
programs.waybar.style =
optionalString osConfig.theme.enable generateGtkColors palette
+ ''
programs.waybar.style = mkMerge [
(mkIf osConfig.theme.enable generateGtkColors palette)
''
* {
/* `otf-font-awesome` is required to be installed for icons */
border: none;
@ -101,5 +102,6 @@ in {
padding: 0 1.2em;
color: @base08;
}
'';
''
];
}