Unverified Commit 2a8a59ae authored by Bobby Rong's avatar Bobby Rong
Browse files

nixos/budgie: Don't enable modules for excludePackages 

ref: bc970e94
ref: nixpkgs issue 299877
parent a6ada050

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/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 = [