Compare commits
No commits in common. "c59622d0fe2d3db2619e6de25a50a6e0c8a6325c" and "90ba974f1cd445c17574961930623945e7cc44c1" have entirely different histories.
c59622d0fe
...
90ba974f1c
2 changed files with 9 additions and 7 deletions
|
@ -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 {
|
||||||
settings.layout.focus-ring.active.color = palette.base0E;
|
layout.focus-ring.active.color = palette.base0E;
|
||||||
}))
|
}))
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -4,16 +4,17 @@
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (osConfig.theme.scheme) palette;
|
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
|
(mapAttrsToList
|
||||||
(name: color: "@define-color ${name} ${color};")
|
(name: color: "@define-color ${name} ${color};")
|
||||||
palette));
|
palette));
|
||||||
in {
|
in {
|
||||||
programs.waybar.style =
|
programs.waybar.style = mkMerge [
|
||||||
optionalString osConfig.theme.enable generateGtkColors palette
|
(mkIf 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;
|
||||||
|
@ -101,5 +102,6 @@ in {
|
||||||
padding: 0 1.2em;
|
padding: 0 1.2em;
|
||||||
color: @base08;
|
color: @base08;
|
||||||
}
|
}
|
||||||
'';
|
''
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue