Skip to content

qt: added extraQtctConfig option #1895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

qt: added extraQtctConfig option #1895

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 31 additions & 17 deletions modules/qt/hm.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
nixosConfig ? null,
...
}:
let
iniFormat = pkgs.formats.ini {
listToValue = values: lib.concatStringsSep ", " values;
};
in
{
options.stylix.targets.qt = {
# TODO: Replace `nixosConfig != null` with
Expand All @@ -28,6 +33,14 @@
type = lib.types.str;
default = "qtct";
};

extraQtctConfig = lib.mkOption {
description = ''
Extra Qtct configuration
'';
inherit (iniFormat) type;
default = { };
};
};

config = lib.mkIf (config.stylix.enable && config.stylix.targets.qt.enable) (
Expand Down Expand Up @@ -83,21 +96,22 @@

xdg.configFile =
let
qtctConf = ''
[Appearance]
''
+ lib.optionalString (config.qt.style ? name) ''
style=${config.qt.style.name}
''
+ lib.optionalString (icons != null) ''
icon_theme=${icons}
''
+ ''
[Fonts]
fixed="${config.stylix.fonts.monospace.name},${toString config.stylix.fonts.sizes.applications}"
general="${config.stylix.fonts.sansSerif.name},${toString config.stylix.fonts.sizes.applications}"
'';

qtctConf =
lib.pipe
{
Appearance =
(lib.optionalAttrs (config.qt.style ? name) { style = config.qt.style.name; })
// (lib.optionalAttrs (icons != null) { icon_theme = icons; });
Fonts = {
# qtct stores fonts settings quotted, because they are comma-separated
fixed = ''"${config.stylix.fonts.monospace.name},${toString config.stylix.fonts.sizes.applications}"'';
general = ''"${config.stylix.fonts.sansSerif.name},${toString config.stylix.fonts.sizes.applications}"'';
};
}
[
(default: lib.recursiveUpdate default config.stylix.target.qt.extraQtctConfig)
(iniFormat.generate "qtct-stylix-config")
];
in
lib.mkMerge [
(lib.mkIf (config.qt.style.name == "kvantum") {
Expand All @@ -112,8 +126,8 @@
})

(lib.mkIf (config.qt.platformTheme.name == "qtct") {
"qt5ct/qt5ct.conf".text = qtctConf;
"qt6ct/qt6ct.conf".text = qtctConf;
"qt5ct/qt5ct.conf".source = qtctConf;
"qt6ct/qt6ct.conf".source = qtctConf;
})
];
}
Expand Down
Loading