about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-08-20 11:35:23 +0800
committerGitHub <noreply@github.com>2023-08-20 11:35:23 +0800
commit5f75be53ea1c23d764652997f39136c0281ed168 (patch)
tree729303b5a61afa6ea0d11d213bc81742374c44f2
parent10df61d44380b776faec04d53bb54721b65f47aa (diff)
parent26adac4d270626a7b884e3bfa429da5e33cfb7af (diff)
downloadnixlib-5f75be53ea1c23d764652997f39136c0281ed168.tar
nixlib-5f75be53ea1c23d764652997f39136c0281ed168.tar.gz
nixlib-5f75be53ea1c23d764652997f39136c0281ed168.tar.bz2
nixlib-5f75be53ea1c23d764652997f39136c0281ed168.tar.lz
nixlib-5f75be53ea1c23d764652997f39136c0281ed168.tar.xz
nixlib-5f75be53ea1c23d764652997f39136c0281ed168.tar.zst
nixlib-5f75be53ea1c23d764652997f39136c0281ed168.zip
Merge pull request #249712 from bobby285271/upd/cinnamon-qt-style
nixos/cinnamon: Override Qt apps style again
-rw-r--r--nixos/doc/manual/release-notes/rl-2311.section.md2
-rw-r--r--nixos/modules/services/x11/desktop-managers/cinnamon.nix7
2 files changed, 8 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 8880c71fa9a6..173f125bd577 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -155,7 +155,7 @@
 
 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.
 
-- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:
+- GNOME, Pantheon, Cinnamon module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream (specifically, Cinnamon now defaults to the gtk2 style instead, following the default in Linux Mint). If you still want it, you can add the following options to your configuration but it will probably be eventually removed:
 
   ```nix
   qt = {
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index d2e16da93456..bb42c52b69ca 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -212,6 +212,13 @@ in
       programs.bash.vteIntegration = mkDefault true;
       programs.zsh.vteIntegration = mkDefault true;
 
+      # Qt application style
+      qt = {
+        enable = mkDefault true;
+        style = mkDefault "gtk2";
+        platformTheme = mkDefault "gtk2";
+      };
+
       # Default Fonts
       fonts.packages = with pkgs; [
         source-code-pro # Default monospace font in 3.32