From ffcf148a8dd6e8d1e240137e3f8071af5fa92a28 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 1 Mar 2023 11:00:01 +0800 Subject: [PATCH] nixos/waybar: allow change waybar package to use also add waybar package to environment.systemPackages --- nixos/modules/programs/waybar.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/waybar.nix b/nixos/modules/programs/waybar.nix index 4697d0f7a622..2c49ae140813 100644 --- a/nixos/modules/programs/waybar.nix +++ b/nixos/modules/programs/waybar.nix @@ -2,17 +2,22 @@ with lib; +let + cfg = config.programs.waybar; +in { options.programs.waybar = { enable = mkEnableOption (lib.mdDoc "waybar"); + package = mkPackageOptionMD pkgs "waybar" { }; }; - config = mkIf config.programs.waybar.enable { + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; systemd.user.services.waybar = { description = "Waybar as systemd service"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; - script = "${pkgs.waybar}/bin/waybar"; + script = "${cfg.package}/bin/waybar"; }; };