Unverified Commit a1b56775 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

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

nixos/{budgie,cinnamon,pantheon}: Don't enable modules for excludePackages
parents 4f1346de 2a8a59ae

nixos/modules/services/x11/desktop-managers/budgie.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 = [

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+5 −5
Original line number Diff line number Diff line
@@ -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

nixos/modules/services/x11/desktop-managers/pantheon.nix

+3 −2
Original line number Diff line number Diff line
@@ -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

nixos/tests/budgie.nix

+4 −0
Original line number Diff line number Diff line
@@ -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 = [

nixos/tests/cinnamon.nix

+4 −0
Original line number Diff line number Diff line
@@ -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 ];

  };