Compare commits

..

2 commits

2 changed files with 7 additions and 9 deletions

View file

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

View file

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