Merge pull request #303115 from bobby285271/upd/exclude-pkgs
nixos/{budgie,cinnamon,pantheon}: Don't enable modules for excludePackages
This commit is contained in:
commit
a1b567757b
|
@ -43,6 +43,8 @@ let
|
||||||
budgie-control-center = pkgs.budgie.budgie-control-center.override {
|
budgie-control-center = pkgs.budgie.budgie-control-center.override {
|
||||||
enableSshSocket = config.services.openssh.startWhenNeeded;
|
enableSshSocket = config.services.openssh.startWhenNeeded;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
notExcluded = pkg: (!(lib.elem pkg config.environment.budgie.excludePackages));
|
||||||
in {
|
in {
|
||||||
meta.maintainers = lib.teams.budgie.members;
|
meta.maintainers = lib.teams.budgie.members;
|
||||||
|
|
||||||
|
@ -160,7 +162,7 @@ in {
|
||||||
++ cfg.sessionPath;
|
++ cfg.sessionPath;
|
||||||
|
|
||||||
# Both budgie-desktop-view and nemo defaults to this emulator.
|
# Both budgie-desktop-view and nemo defaults to this emulator.
|
||||||
programs.gnome-terminal.enable = mkDefault true;
|
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);
|
||||||
|
|
||||||
# Fonts.
|
# Fonts.
|
||||||
fonts.packages = [
|
fonts.packages = [
|
||||||
|
|
|
@ -95,7 +95,7 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Default services
|
# Default services
|
||||||
services.blueman.enable = mkDefault true;
|
services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
|
||||||
hardware.bluetooth.enable = mkDefault true;
|
hardware.bluetooth.enable = mkDefault true;
|
||||||
hardware.pulseaudio.enable = mkDefault true;
|
hardware.pulseaudio.enable = mkDefault true;
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
@ -228,10 +228,10 @@ in
|
||||||
})
|
})
|
||||||
|
|
||||||
(mkIf serviceCfg.apps.enable {
|
(mkIf serviceCfg.apps.enable {
|
||||||
programs.geary.enable = mkDefault true;
|
programs.geary.enable = mkDefault (notExcluded pkgs.gnome.geary);
|
||||||
programs.gnome-disks.enable = mkDefault true;
|
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);
|
||||||
programs.gnome-terminal.enable = mkDefault true;
|
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);
|
||||||
programs.file-roller.enable = mkDefault true;
|
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
|
||||||
|
|
||||||
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
|
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
|
||||||
# cinnamon team apps
|
# cinnamon team apps
|
||||||
|
|
|
@ -12,6 +12,7 @@ let
|
||||||
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
|
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
notExcluded = pkg: (!(lib.elem pkg config.environment.pantheon.excludePackages));
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -288,8 +289,8 @@ in
|
||||||
})
|
})
|
||||||
|
|
||||||
(mkIf serviceCfg.apps.enable {
|
(mkIf serviceCfg.apps.enable {
|
||||||
programs.evince.enable = mkDefault true;
|
programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);
|
||||||
programs.file-roller.enable = mkDefault true;
|
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
|
||||||
|
|
||||||
environment.systemPackages = utils.removePackagesByName ([
|
environment.systemPackages = utils.removePackagesByName ([
|
||||||
pkgs.gnome.gnome-font-viewer
|
pkgs.gnome.gnome-font-viewer
|
||||||
|
|
|
@ -18,6 +18,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# We don't ship gnome-text-editor in Budgie module, we add this line mainly
|
||||||
|
# to catch eval issues related to this option.
|
||||||
|
environment.budgie.excludePackages = [ pkgs.gnome-text-editor ];
|
||||||
|
|
||||||
services.xserver.desktopManager.budgie = {
|
services.xserver.desktopManager.budgie = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPlugins = [
|
extraPlugins = [
|
||||||
|
|
|
@ -8,6 +8,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.xserver.desktopManager.cinnamon.enable = true;
|
services.xserver.desktopManager.cinnamon.enable = true;
|
||||||
|
|
||||||
|
# We don't ship gnome-text-editor in Cinnamon module, we add this line mainly
|
||||||
|
# to catch eval issues related to this option.
|
||||||
|
environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ];
|
||||||
|
|
||||||
# For the sessionPath subtest.
|
# For the sessionPath subtest.
|
||||||
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
|
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -13,6 +13,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.xserver.desktopManager.pantheon.enable = true;
|
services.xserver.desktopManager.pantheon.enable = true;
|
||||||
|
|
||||||
|
# We ship pantheon.appcenter by default when this is enabled.
|
||||||
|
services.flatpak.enable = true;
|
||||||
|
|
||||||
|
# We don't ship gnome-text-editor in Pantheon module, we add this line mainly
|
||||||
|
# to catch eval issues related to this option.
|
||||||
|
environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ];
|
||||||
|
|
||||||
environment.systemPackages = [ pkgs.xdotool ];
|
environment.systemPackages = [ pkgs.xdotool ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user