Update GTK theme to use accentColourName
Swap from adwaita to adw-gtk3 since adwaita didn't properly allow overwriting the CSS (I think)
This commit is contained in:
parent
7ea03d08bf
commit
e1146e62c7
|
@ -1,7 +1,10 @@
|
|||
scheme:
|
||||
{
|
||||
scheme,
|
||||
accentColourName,
|
||||
}:
|
||||
with scheme.withHashtag; ''
|
||||
@define-color accent_color ${base0D-hex};
|
||||
@define-color accent_bg_color ${base0D-hex};
|
||||
@define-color accent_color ${scheme.withHashtag."${accentColourName}-hex"};
|
||||
@define-color accent_bg_color ${scheme.withHashtag."${accentColourName}-hex"};
|
||||
@define-color accent_fg_color ${base00-hex};
|
||||
@define-color destructive_color ${base08-hex};
|
||||
@define-color destructive_bg_color ${base08-hex};
|
||||
|
@ -9,8 +12,8 @@ with scheme.withHashtag; ''
|
|||
@define-color success_color ${base0B-hex};
|
||||
@define-color success_bg_color ${base0B-hex};
|
||||
@define-color success_fg_color ${base00-hex};
|
||||
@define-color warning_color ${base0E-hex};
|
||||
@define-color warning_bg_color ${base0E-hex};
|
||||
@define-color warning_color ${base0A-hex};
|
||||
@define-color warning_bg_color ${base0A-hex};
|
||||
@define-color warning_fg_color ${base00-hex};
|
||||
@define-color error_color ${base08-hex};
|
||||
@define-color error_bg_color ${base08-hex};
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
accentColourName,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
@ -74,11 +75,18 @@
|
|||
};
|
||||
programs.mpv.enable = true;
|
||||
gtk = let
|
||||
extraCss = import ./base16/gtk.nix config.scheme;
|
||||
extraCss = import ./base16/gtk.nix {
|
||||
inherit (config) scheme;
|
||||
inherit accentColourName;
|
||||
};
|
||||
in {
|
||||
enable = true;
|
||||
gtk3 = {inherit extraCss;};
|
||||
gtk4 = {inherit extraCss;};
|
||||
theme = {
|
||||
package = pkgs.adw-gtk3;
|
||||
name = "adw-gtk3";
|
||||
};
|
||||
iconTheme = {
|
||||
package = pkgs.papirus-icon-theme.override {color = "violet";};
|
||||
name =
|
||||
|
@ -86,13 +94,6 @@
|
|||
then "Papirus-Light"
|
||||
else "Papirus-Dark";
|
||||
};
|
||||
theme = {
|
||||
package = pkgs.gnome.gnome-themes-extra;
|
||||
name =
|
||||
if config.scheme.variant == "light"
|
||||
then "Adwaita"
|
||||
else "Adwaita-dark";
|
||||
};
|
||||
};
|
||||
qt = {
|
||||
enable = true;
|
||||
|
|
Loading…
Reference in a new issue