From e9b9ecef4295a835ab073814f100498716b05a96 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Sat, 16 Dec 2023 09:01:19 -0500 Subject: [PATCH] gtk: fix GTK 4 theme being ignored Haven't dug into any code, but my best guess is GTK 4 ignores it on purpose since devs campaigned against theming: https://stopthemingmy.app According to the following link, it's fine for users to do it as long as they don't expect support from app devs. And the campaign was against distributions applying custom themes by default. https://github.com/GradienceTeam/Gradience/tree/0.4.1#%EF%B8%8F-gradience-stopthemingmyapp-and-adwaita-developers --- modules/misc/gtk.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix index c20424b1f..6454eb2ae 100644 --- a/modules/misc/gtk.nix +++ b/modules/misc/gtk.nix @@ -35,6 +35,8 @@ let Package providing the theme. This package will be installed to your profile. If `null` then the theme is assumed to already be available in your profile. + + For the theme to apply to GTK 4, this option is mandatory. ''; }; @@ -233,6 +235,15 @@ in { gtk-cursor-theme-size = cfg.cursorTheme.size; }; + gtk4Css = + lib.optionalString (cfg.theme != null && cfg.theme.package != null) '' + /** + * GTK 4 reads the theme configured by gtk-theme-name, but ignores it. + * It does however respect user CSS, so import the theme from here. + **/ + @import url("file://${cfg.theme.package}/share/themes/${cfg.theme.name}/gtk-4.0/gtk.css"); + '' + cfg4.extraCss; + dconfIni = optionalAttrs (cfg.font != null) { font-name = let fontSize = @@ -277,8 +288,7 @@ in { xdg.configFile."gtk-4.0/settings.ini".text = toGtk3Ini { Settings = gtkIni // cfg4.extraConfig; }; - xdg.configFile."gtk-4.0/gtk.css" = - mkIf (cfg4.extraCss != "") { text = cfg4.extraCss; }; + xdg.configFile."gtk-4.0/gtk.css" = mkIf (gtk4Css != "") { text = gtk4Css; }; dconf.settings."org/gnome/desktop/interface" = dconfIni; });