From ddd4973ddb8807a9cec272d224cffd104a4f54a1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 11 Aug 2023 22:22:38 +0800 Subject: [PATCH] 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. --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 +- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 5 ----- 2 files changed, 1 insertion(+), 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 8ede5b28b3e2..e42f7a5d58d2 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 b3cbe4c324df..d2e16da93456 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