diff options
author | (cdep)illabout <cdep.illabout@gmail.com> | 2021-05-20 10:08:26 +0900 |
---|---|---|
committer | (cdep)illabout <cdep.illabout@gmail.com> | 2021-05-20 10:08:26 +0900 |
commit | 408d7aabb477f3f9d3ed0441a00833e2c1b72ca8 (patch) | |
tree | 46c04d61df249c86927fdede4ec1a26f01f5bffb /nixos/modules/services/x11/desktop-managers/gnome.nix | |
parent | 0eb2dc5d7b987499e75cdea61693bb91358c63e6 (diff) | |
parent | 7fe78d4f9efc88e5c6a4b9591bd8b41fee656df6 (diff) | |
download | nixpkgs-408d7aabb477f3f9d3ed0441a00833e2c1b72ca8.tar nixpkgs-408d7aabb477f3f9d3ed0441a00833e2c1b72ca8.tar.gz nixpkgs-408d7aabb477f3f9d3ed0441a00833e2c1b72ca8.tar.bz2 nixpkgs-408d7aabb477f3f9d3ed0441a00833e2c1b72ca8.tar.lz nixpkgs-408d7aabb477f3f9d3ed0441a00833e2c1b72ca8.tar.xz nixpkgs-408d7aabb477f3f9d3ed0441a00833e2c1b72ca8.tar.zst nixpkgs-408d7aabb477f3f9d3ed0441a00833e2c1b72ca8.zip |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'nixos/modules/services/x11/desktop-managers/gnome.nix')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/gnome.nix | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 5964bd1a52c..bacada9cbe7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -292,11 +292,6 @@ in # If gnome is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - - # Install gnome-software if flatpak is enabled - services.flatpak.guiPackages = [ - pkgs.gnome.gnome-software - ]; }) (mkIf flashbackEnabled { @@ -467,31 +462,39 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { - environment.systemPackages = (with pkgs.gnome; removePackagesByName [ - baobab - cheese - eog - epiphany - gedit - gnome-calculator - gnome-calendar - gnome-characters - gnome-clocks - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - pkgs.gnome-photos - gnome-screenshot - gnome-system-monitor - gnome-weather - nautilus - pkgs.gnome-connections - simple-scan - totem - yelp - ] config.environment.gnome.excludePackages); + environment.systemPackages = + with pkgs.gnome; + removePackagesByName + ([ + baobab + cheese + eog + epiphany + gedit + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-contacts + gnome-font-viewer + gnome-logs + gnome-maps + gnome-music + pkgs.gnome-photos + gnome-screenshot + gnome-system-monitor + gnome-weather + nautilus + pkgs.gnome-connections + simple-scan + totem + yelp + ] ++ lib.optionals config.services.flatpak.enable [ + # Since PackageKit Nix support is not there yet, + # only install gnome-software if flatpak is enabled. + gnome-software + ]) + config.environment.gnome.excludePackages; # Enable default program modules # Since some of these have a corresponding package, we only |