cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nixos/budgie: Don't enable modules for excludePackages

Browse source 
ref: bc970e94e7
ref: nixpkgs issue 299877
This commit is contained in:
Bobby Rong 2024-04-10 21:33:34 +08:00
parent a6ada0502b
commit 2a8a59aebb
No known key found for this signature in database
2 changed files with 7 additions and 1 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 { 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 = [

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 = { services.xserver.desktopManager.budgie = {
enable = true; enable = true;
extraPlugins = [ extraPlugins = [