nixos/gnome: make it possible to remove core packages

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Ryan Horiguchi 2021-12-16 20:31:45 +01:00 committed by Jan Tojnar
parent ca23e42105
commit 42ceb20d29

View file

@ -403,10 +403,17 @@ in
}) })
(mkIf serviceCfg.core-shell.enable { (mkIf serviceCfg.core-shell.enable {
services.xserver.desktopManager.gnome.sessionPath = [ services.xserver.desktopManager.gnome.sessionPath =
pkgs.gnome.gnome-shell let
pkgs.gnome.gnome-shell-extensions mandatoryPackages = [
]; pkgs.gnome.gnome-shell
];
optionalPackages = [
pkgs.gnome.gnome-shell-extensions
];
in
mandatoryPackages
++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages;
services.colord.enable = mkDefault true; services.colord.enable = mkDefault true;
services.gnome.chrome-gnome-shell.enable = mkDefault true; services.gnome.chrome-gnome-shell.enable = mkDefault true;
@ -460,24 +467,31 @@ in
]; ];
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = with pkgs.gnome; [ environment.systemPackages =
adwaita-icon-theme let
nixos-background-info mandatoryPackages = with pkgs.gnome; [
gnome-backgrounds gnome-shell
gnome-bluetooth ];
gnome-color-manager optionalPackages = with pkgs.gnome; [
gnome-control-center adwaita-icon-theme
gnome-shell nixos-background-info
gnome-shell-extensions gnome-backgrounds
gnome-themes-extra gnome-bluetooth
pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. gnome-color-manager
pkgs.gnome-user-docs gnome-control-center
pkgs.orca gnome-shell-extensions
pkgs.glib # for gsettings gnome-themes-extra
pkgs.gnome-menus pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
pkgs.gtk3.out # for gtk-launch pkgs.gnome-user-docs
pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.orca
]; pkgs.glib # for gsettings program
pkgs.gnome-menus
pkgs.gtk3.out # for gtk-launch program
pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
];
in
mandatoryPackages
++ utils.removePackagesByName optionalPackages config.environment.gnome.excludePackages;
}) })
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst