From ed6c662ed0014186f39f72ed727244a74e969dce Mon Sep 17 00:00:00 2001 From: myuujiku Date: Sun, 31 Mar 2024 13:49:04 +0200 Subject: [PATCH 1/2] gtk: GTK4 theming should be opt-in --- modules/misc/gtk.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix index 6454eb2a..434ccbcb 100644 --- a/modules/misc/gtk.nix +++ b/modules/misc/gtk.nix @@ -215,6 +215,8 @@ in { {file}`$XDG_CONFIG_HOME/gtk-4.0/gtk.css`. ''; }; + + enableTheme = mkEnableOption "Add gtkk theme to user CSS"; }; }; }; @@ -236,7 +238,7 @@ in { }; gtk4Css = - lib.optionalString (cfg.theme != null && cfg.theme.package != null) '' + lib.optionalString (cfg4.enableTheme && 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. From 25f69261d617e422494194a541d20b8e05996fb2 Mon Sep 17 00:00:00 2001 From: myuujiku Date: Sun, 31 Mar 2024 13:59:37 +0200 Subject: [PATCH 2/2] gtk: run format --- modules/misc/gtk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix index 434ccbcb..6aefb2ba 100644 --- a/modules/misc/gtk.nix +++ b/modules/misc/gtk.nix @@ -237,8 +237,8 @@ in { gtk-cursor-theme-size = cfg.cursorTheme.size; }; - gtk4Css = - lib.optionalString (cfg4.enableTheme && cfg.theme != null && cfg.theme.package != null) '' + gtk4Css = lib.optionalString + (cfg4.enableTheme && 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.