summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-08-11 22:22:38 +0800
committerBobby Rong <rjl931189261@126.com>2023-08-13 12:21:54 +0800
commitddd4973ddb8807a9cec272d224cffd104a4f54a1 (patch)
tree3fda6a6065df6900dd3c55130f74edddd997dd9e
parentf4e1e8627d421d7c3bbdc2811abebd8c15169019 (diff)
downloadnixpkgs-ddd4973ddb8807a9cec272d224cffd104a4f54a1.tar
nixpkgs-ddd4973ddb8807a9cec272d224cffd104a4f54a1.tar.gz
nixpkgs-ddd4973ddb8807a9cec272d224cffd104a4f54a1.tar.bz2
nixpkgs-ddd4973ddb8807a9cec272d224cffd104a4f54a1.tar.lz
nixpkgs-ddd4973ddb8807a9cec272d224cffd104a4f54a1.tar.xz
nixpkgs-ddd4973ddb8807a9cec272d224cffd104a4f54a1.tar.zst
nixpkgs-ddd4973ddb8807a9cec272d224cffd104a4f54a1.zip
nixos/cinnamon: Drop qgnomeplatform
The upstream is not maintained, and qadwaitadecoration
does not seem to be xorg-related. We should have proper
shadows when using SSD.
-rw-r--r--nixos/doc/manual/release-notes/rl-2311.section.md2
-rw-r--r--nixos/modules/services/x11/desktop-managers/cinnamon.nix5
2 files changed, 1 insertions, 6 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 8ede5b28b3e..e42f7a5d58d 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -140,7 +140,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 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. 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 b3cbe4c324d..d2e16da9345 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -212,11 +212,6 @@ in
       programs.bash.vteIntegration = mkDefault true;
       programs.zsh.vteIntegration = mkDefault true;
 
-      # Harmonize Qt applications under Cinnamon
-      qt.enable = true;
-      qt.platformTheme = "gnome";
-      qt.style = "adwaita";
-
       # Default Fonts
       fonts.packages = with pkgs; [
         source-code-pro # Default monospace font in 3.32