From 1021b7d7322c4a3eada82bc6e60c6bedf08cfce1 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Sun, 20 Jul 2025 23:09:00 +0200 Subject: [PATCH] stylix: simplify API by renaming stylix.iconTheme option to stylix.icons --- modules/fuzzel/hm.nix | 6 +++--- modules/qt/hm.nix | 10 +++++----- stylix/hm/default.nix | 4 ++-- stylix/hm/{icon-theme.nix => icons.nix} | 2 +- stylix/{icon-theme.nix => icons.nix} | 16 +++++++++++++++- 5 files changed, 26 insertions(+), 12 deletions(-) rename stylix/hm/{icon-theme.nix => icons.nix} (93%) rename stylix/{icon-theme.nix => icons.nix} (72%) diff --git a/modules/fuzzel/hm.nix b/modules/fuzzel/hm.nix index 89ff5d6e..156187c5 100644 --- a/modules/fuzzel/hm.nix +++ b/modules/fuzzel/hm.nix @@ -33,10 +33,10 @@ mkTarget { } ) ( - { polarity, iconTheme }: + { polarity, icons }: { - programs.fuzzel.settings.main."icon-theme" = - if (polarity == "dark") then iconTheme.dark else iconTheme.light; + programs.fuzzel.settings.main."icons" = + if (polarity == "dark") then icons.dark else icons.light; } ) ]; diff --git a/modules/qt/hm.nix b/modules/qt/hm.nix index dd876237..7b3f2a64 100644 --- a/modules/qt/hm.nix +++ b/modules/qt/hm.nix @@ -33,11 +33,11 @@ config = lib.mkIf (config.stylix.enable && config.stylix.targets.qt.enable) ( let - iconTheme = + icons = if (config.stylix.polarity == "dark") then - config.stylix.iconTheme.dark + config.stylix.icons.dark else - config.stylix.iconTheme.light; + config.stylix.icons.light; recommendedStyles = { gnome = if config.stylix.polarity == "dark" then "adwaita-dark" else "adwaita"; @@ -91,8 +91,8 @@ + lib.optionalString (config.qt.style ? name) '' style=${config.qt.style.name} '' - + lib.optionalString (iconTheme != null) '' - icon_theme=${iconTheme} + + lib.optionalString (icons != null) '' + icon_theme=${icons} ''; in diff --git a/stylix/hm/default.nix b/stylix/hm/default.nix index aab011c1..78f12e1c 100644 --- a/stylix/hm/default.nix +++ b/stylix/hm/default.nix @@ -9,11 +9,11 @@ in { imports = [ ./cursor.nix - ./icon-theme.nix + ./icons.nix ./palette.nix ../cursor.nix ../fonts.nix - ../icon-theme.nix + ../icons.nix ../opacity.nix ../palette.nix ../pixel.nix diff --git a/stylix/hm/icon-theme.nix b/stylix/hm/icons.nix similarity index 93% rename from stylix/hm/icon-theme.nix rename to stylix/hm/icons.nix index 63b785e1..76b4b560 100644 --- a/stylix/hm/icon-theme.nix +++ b/stylix/hm/icons.nix @@ -1,6 +1,6 @@ { config, lib, ... }: let - cfg = config.stylix.iconTheme; + cfg = config.stylix.icons; inherit (config.stylix) polarity; in { diff --git a/stylix/icon-theme.nix b/stylix/icons.nix similarity index 72% rename from stylix/icon-theme.nix rename to stylix/icons.nix index b19e9063..f9725b49 100644 --- a/stylix/icon-theme.nix +++ b/stylix/icons.nix @@ -1,6 +1,20 @@ { lib, ... }: { - options.stylix.iconTheme = { + imports = [ + (lib.mkRenamedOptionModuleWith { + from = [ + "stylix" + "iconTheme" + ]; + sinceRelease = 2511; + to = [ + "stylix" + "icons" + ]; + }) + ]; + + options.stylix.icons = { enable = lib.mkOption { description = "enable/disable icon theming."; type = lib.types.bool;