nixos/gnome3: fixup unconditional code
This commit is contained in:
parent
4d1dab4ccd
commit
afdeb406b0
@ -53,6 +53,8 @@ let
|
|||||||
|
|
||||||
flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
|
flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
|
||||||
|
|
||||||
|
notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome3.excludePackages));
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
@ -363,6 +365,18 @@ in
|
|||||||
/* gnome-boxes */
|
/* gnome-boxes */
|
||||||
] config.environment.gnome3.excludePackages);
|
] config.environment.gnome3.excludePackages);
|
||||||
|
|
||||||
|
# Enable default program modules
|
||||||
|
# Since some of these have a corresponding package, we only
|
||||||
|
# enable that program module if the package hasn't been excluded
|
||||||
|
# through `environment.gnome3.excludePackages`
|
||||||
|
programs.evince.enable = notExcluded pkgs.gnome3.evince;
|
||||||
|
programs.file-roller.enable = notExcluded pkgs.gnome3.file-roller;
|
||||||
|
programs.geary.enable = notExcluded pkgs.gnome3.geary;
|
||||||
|
programs.gnome-disks.enable = notExcluded pkgs.gnome3.gnome-disk-utility;
|
||||||
|
programs.gnome-terminal.enable = notExcluded pkgs.gnome3.gnome-terminal;
|
||||||
|
programs.seahorse.enable = notExcluded pkgs.gnome3.seahorse;
|
||||||
|
services.gnome3.sushi.enable = notExcluded pkgs.gnome3.sushi;
|
||||||
|
|
||||||
# Let nautilus find extensions
|
# Let nautilus find extensions
|
||||||
# TODO: Create nautilus-with-extensions package
|
# TODO: Create nautilus-with-extensions package
|
||||||
environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
|
environment.sessionVariables.NAUTILUS_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-3.0";
|
||||||
@ -375,25 +389,6 @@ in
|
|||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
||||||
# Enable default program modules
|
|
||||||
# Since some of these have a corresponding package, we only
|
|
||||||
# enable that program module if the package hasn't been excluded
|
|
||||||
# through `environment.gnome3.excludePackages`
|
|
||||||
(
|
|
||||||
let
|
|
||||||
notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome3.excludePackages));
|
|
||||||
in
|
|
||||||
with pkgs.gnome3;
|
|
||||||
{
|
|
||||||
programs.evince.enable = notExcluded evince;
|
|
||||||
programs.file-roller.enable = notExcluded file-roller;
|
|
||||||
programs.geary.enable = notExcluded geary;
|
|
||||||
programs.gnome-disks.enable = notExcluded gnome-disk-utility;
|
|
||||||
programs.gnome-terminal.enable = notExcluded gnome-terminal;
|
|
||||||
programs.seahorse.enable = notExcluded seahorse;
|
|
||||||
services.gnome3.sushi.enable = notExcluded sushi;
|
|
||||||
})
|
|
||||||
|
|
||||||
(mkIf serviceCfg.games.enable {
|
(mkIf serviceCfg.games.enable {
|
||||||
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
|
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
|
||||||
aisleriot atomix five-or-more four-in-a-row gnome-chess gnome-klotski
|
aisleriot atomix five-or-more four-in-a-row gnome-chess gnome-klotski
|
||||||
|
Loading…
Reference in New Issue
Block a user