colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303115 from bobby285271/upd/exclude-pkgs 

nixos/{budgie,cinnamon,pantheon}: Don't enable modules for excludePackages
This commit is contained in:
Bobby Rong 2024-04-11 20:41:13 +08:00 committed by GitHub
parent 4f1346de92 2a8a59aebb
commit a1b567757b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/x11/desktop-managers/budgie.nix
View File

@ -43,6 +43,8 @@ let
budgie-control-center = pkgs.budgie.budgie-control-center.override {
enableSshSocket = config.services.openssh.startWhenNeeded;
};
notExcluded = pkg: (!(lib.elem pkg config.environment.budgie.excludePackages));
in {
meta.maintainers = lib.teams.budgie.members;
@ -160,7 +162,7 @@ in {
++ cfg.sessionPath;
# 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.packages = [

10
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -95,7 +95,7 @@ in
'';
# Default services
services.blueman.enable = mkDefault true;
services.blueman.enable = mkDefault (notExcluded pkgs.blueman);
hardware.bluetooth.enable = mkDefault true;
hardware.pulseaudio.enable = mkDefault true;
security.polkit.enable = true;
@ -228,10 +228,10 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.geary.enable = mkDefault true;
programs.gnome-disks.enable = mkDefault true;
programs.gnome-terminal.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
programs.geary.enable = mkDefault (notExcluded pkgs.gnome.geary);
programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);
programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [
# cinnamon team apps

5
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@ -12,6 +12,7 @@ let
extraGSettingsOverrides = cfg.extraGSettingsOverrides;
};
notExcluded = pkg: (!(lib.elem pkg config.environment.pantheon.excludePackages));
in
{
@ -288,8 +289,8 @@ in
})
(mkIf serviceCfg.apps.enable {
programs.evince.enable = mkDefault true;
programs.file-roller.enable = mkDefault true;
programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);
programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);
environment.systemPackages = utils.removePackagesByName ([
pkgs.gnome.gnome-font-viewer

4
nixos/tests/budgie.nix
View File

@ -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 = {
enable = true;
extraPlugins = [

4
nixos/tests/cinnamon.nix
View File

@ -8,6 +8,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
services.xserver.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.
services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];
};

7
nixos/tests/pantheon.nix
View File

@ -13,6 +13,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
services.xserver.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 ];
};