diff options
| author | gnidorah <gnidorah@users.noreply.github.com> | 2019-10-13 08:55:36 +0300 |
|---|---|---|
| committer | gnidorah <gnidorah@users.noreply.github.com> | 2020-02-21 18:57:56 +0300 |
| commit | 1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be (patch) | |
| tree | 76c4f6104acd9a55315529d9ac4a7ad844d6a9b4 /nixos | |
| parent | 379c3f685c925f57dc38805a602a96d2f35db130 (diff) | |
| download | nixlib-1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be.tar nixlib-1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be.tar.gz nixlib-1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be.tar.bz2 nixlib-1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be.tar.lz nixlib-1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be.tar.xz nixlib-1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be.tar.zst nixlib-1bd7ea84ad7e2bb4643ecf0f62e376aeb05ad7be.zip | |
nixos/qt5: rename to qt
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/config/qt.nix (renamed from nixos/modules/config/qt5.nix) | 22 | ||||
| -rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 6 |
3 files changed, 19 insertions, 11 deletions
diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt.nix index fb3e03c4b3fe..a145eaab4f1a 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.qt5; + cfg = config.qt; toQtIni = generators.toINI { mkKeyValue = key: value: @@ -79,7 +79,7 @@ let } { assertion = cfg.font == null && cfg.iconTheme == null; - message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform."; + message = "`qt.font` and `qt.iconTheme` are only supported by kde platform."; } ]; environment.variables.QT_QPA_PLATFORMTHEME = "gtk2"; @@ -99,7 +99,7 @@ let assertions = [ { assertion = cfg.font == null && cfg.iconTheme == null; - message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform."; + message = "`qt.font` and `qt.iconTheme` are only supported by kde platform."; } ]; environment.variables.QT_QPA_PLATFORMTHEME = "qgnomeplatform"; @@ -126,7 +126,7 @@ let } { assertion = cfg.font == null && cfg.iconTheme == null; - message = "`qt5.font` and `qt5.iconTheme` are only supported by kde platform."; + message = "`qt.font` and `qt.iconTheme` are only supported by kde platform."; } ]; environment.variables.QT_QPA_PLATFORMTHEME = "gtk3"; @@ -155,16 +155,24 @@ in { + imports = [ + (mkRenamedOptionModule [ "qt5" "style" ] [ "qt" "style" ]) + (mkRenamedOptionModule [ "qt5" "enable" ] [ "qt" "enable" ]) + (mkRenamedOptionModule [ "qt5" "platformTheme" ] [ "qt" "platformTheme" ]) + (mkRenamedOptionModule [ "qt5" "font" ] [ "qt" "font" ]) + (mkRenamedOptionModule [ "qt5" "iconTheme" ] [ "qt" "iconTheme" ]) + ]; + options = { - qt5 = { + qt = { - enable = mkEnableOption "Qt5 theming configuration"; + enable = mkEnableOption "Qt theming configuration"; platformTheme = mkOption { type = types.enum (attrNames platforms); example = head (attrNames platforms); description = '' - Selects the platform theme to use for Qt5 applications.</para> + Selects the platform theme to use for Qt applications.</para> <para>The options are <variablelist> ${concatStrings (mapAttrsToList (name: value: value.description) platforms)} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 101c235e63f4..089737fcf0ae 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -27,7 +27,7 @@ ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix - ./config/qt5.nix + ./config/qt.nix ./config/resolvconf.nix ./config/shells-environment.nix ./config/swap.nix diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index b46a2d189ef9..5b3fea845964 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -242,9 +242,9 @@ in programs.zsh.vteIntegration = mkDefault true; # Harmonize Qt5 applications under Pantheon - qt5.enable = true; - qt5.platformTheme = "gnome"; - qt5.style = "adwaita"; + qt.enable = true; + qt.platformTheme = "qgnomeplatform"; + qt.style.name = "adwaita"; # Default Fonts fonts.fonts = with pkgs; [ |