Merge branch 'gnome-notExcluded'

Changed files
+2 -2
nixos
modules
services
x11
desktop-managers
+1 -1
nixos/modules/services/x11/desktop-managers/cinnamon.nix
···
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
};
-
notExcluded = pkg: (!(lib.elem pkg config.environment.cinnamon.excludePackages));
in
{
···
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
};
+
notExcluded = pkg: (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.cinnamon.excludePackages)));
in
{
+1 -1
nixos/modules/services/x11/desktop-managers/gnome.nix
···
enableGnomePanel = true;
} ++ cfg.flashback.customSessions;
-
notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages));
in
···
enableGnomePanel = true;
} ++ cfg.flashback.customSessions;
+
notExcluded = pkg: mkDefault (!(lib.elem (lib.getName pkg) (map lib.getName config.environment.gnome.excludePackages)));
in