about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-12-03 12:20:39 +0800
committerGitHub <noreply@github.com>2023-12-03 12:20:39 +0800
commit43744f5bc4849b95ab78f24ca44b4929ae0ecf85 (patch)
treec240304c533a36a9eb48def3da2c0ab37e74a718 /nixos/modules
parent0aa1cc9fa4c2d70efece2bb5532c358c937de47d (diff)
parent74065b1858490a3fc0d2b80033d0a74996844c3e (diff)
downloadnixlib-43744f5bc4849b95ab78f24ca44b4929ae0ecf85.tar
nixlib-43744f5bc4849b95ab78f24ca44b4929ae0ecf85.tar.gz
nixlib-43744f5bc4849b95ab78f24ca44b4929ae0ecf85.tar.bz2
nixlib-43744f5bc4849b95ab78f24ca44b4929ae0ecf85.tar.lz
nixlib-43744f5bc4849b95ab78f24ca44b4929ae0ecf85.tar.xz
nixlib-43744f5bc4849b95ab78f24ca44b4929ae0ecf85.tar.zst
nixlib-43744f5bc4849b95ab78f24ca44b4929ae0ecf85.zip
Merge pull request #268515 from NixOS/cinnamon
Cinnamon 6.0
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/x11/desktop-managers/cinnamon.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index a882bb140d21..e9cadf219468 100644
--- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix
+++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
@@ -200,8 +200,7 @@ in
         })
       ];
 
-      # https://salsa.debian.org/cinnamon-team/cinnamon/-/commit/f87c64f8d35ba406eb11ad442989a0716f6620cf#
-      xdg.portal.config.x-cinnamon.default = mkDefault [ "xapp" "gtk" ];
+      xdg.portal.configPackages = mkDefault [ pkgs.cinnamon.cinnamon-common ];
 
       # Override GSettings schemas
       environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";