summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Stadig <paul@thoughtfull.systems>2023-07-24 07:55:10 -0400
committerPaul Stadig <paul@thoughtfull.systems>2023-07-24 07:55:10 -0400
commitcb2f5313320368ab0324958733d5f41cc59587c7 (patch)
tree32b74c63211de81f50de18c88997871b9eb04b9d
parent1c5e23c40559f0711b3a5b5ee94c230a5c852683 (diff)
downloadnixpkgs-cb2f5313320368ab0324958733d5f41cc59587c7.tar
nixpkgs-cb2f5313320368ab0324958733d5f41cc59587c7.tar.gz
nixpkgs-cb2f5313320368ab0324958733d5f41cc59587c7.tar.bz2
nixpkgs-cb2f5313320368ab0324958733d5f41cc59587c7.tar.lz
nixpkgs-cb2f5313320368ab0324958733d5f41cc59587c7.tar.xz
nixpkgs-cb2f5313320368ab0324958733d5f41cc59587c7.tar.zst
nixpkgs-cb2f5313320368ab0324958733d5f41cc59587c7.zip
nixos/xfce: allow exclusion of xfce4-notifyd
Use `environment.xfce.excludePackages` with `systemd.packages` so `xfce4-notifyd` can be excluded
from installation.
-rw-r--r--nixos/modules/services/x11/desktop-managers/xfce.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index d15c6d183f0..191b3690c02 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.xserver.desktopManager.xfce;
+  excludePackages = config.environment.xfce.excludePackages;
 
 in
 {
@@ -128,7 +129,7 @@ in
       ] ++ optionals (!cfg.noDesktop) [
         xfce4-panel
         xfdesktop
-      ] ++ optional cfg.enableScreensaver xfce4-screensaver) config.environment.xfce.excludePackages;
+      ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
 
     programs.xfconf.enable = true;
     programs.thunar.enable = true;
@@ -172,9 +173,9 @@ in
     programs.zsh.vteIntegration = mkDefault true;
 
     # Systemd services
-    systemd.packages = with pkgs.xfce; [
+    systemd.packages = utils.removePackagesByName (with pkgs.xfce; [
       xfce4-notifyd
-    ];
+    ]) excludePackages;
 
     security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver;
   };