diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix
index eabba9ad95f0..542a96ba6b06 100644
--- a/nixos/modules/config/qt5.nix
+++ b/nixos/modules/config/qt5.nix
@@ -8,14 +8,17 @@ let
isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"];
isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]);
+ isQt5ct = cfg.platformTheme == "qt5ct";
packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
+ else if isQt5ct then [ pkgs.libsForQt5.qt5ct ]
else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";
in
{
+ meta.maintainers = [ maintainers.romildo ];
options = {
qt5 = {
@@ -26,11 +29,13 @@ in
type = types.enum [
"gtk2"
"gnome"
+ "qt5ct"
];
example = "gnome";
relatedPackages = [
"qgnomeplatform"
["libsForQt5" "qtstyleplugins"]
+ ["libsForQt5" "qt5ct"]
];
description = ''
Selects the platform theme to use for Qt5 applications.
@@ -48,6 +53,13 @@ in
qgnomeplatform
+
+ qt5ct
+ Use Qt style set using the
+ qt5ct
+ application.
+
+
'';
};
@@ -96,7 +108,7 @@ in
environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme;
- environment.variables.QT_STYLE_OVERRIDE = cfg.style;
+ environment.variables.QT_STYLE_OVERRIDE = mkIf (! isQt5ct) cfg.style;
environment.systemPackages = packages;
diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix
index 88e861bf4031..3ff47b355915 100644
--- a/nixos/modules/programs/qt5ct.nix
+++ b/nixos/modules/programs/qt5ct.nix
@@ -1,31 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ lib, ... }:
with lib;
{
- meta.maintainers = [ maintainers.romildo ];
-
- ###### interface
- options = {
- programs.qt5ct = {
- enable = mkOption {
- default = false;
- type = types.bool;
- description = ''
- Whether to enable the Qt5 Configuration Tool (qt5ct), a
- program that allows users to configure Qt5 settings (theme,
- font, icons, etc.) under desktop environments or window
- manager without Qt integration.
-
- Official home page: https://sourceforge.net/projects/qt5ct/
- '';
- };
- };
- };
-
- ###### implementation
- config = mkIf config.programs.qt5ct.enable {
- environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct";
- environment.systemPackages = with pkgs; [ libsForQt5.qt5ct ];
- };
+ imports = [
+ (mkRemovedOptionModule [ "programs" "qt5ct" "enable" ] "Use qt5.platformTheme = \"qt5ct\" instead.")
+ ];
}