From 567312006a06ccb398816152eb1a5f6b65f8a8b2 Mon Sep 17 00:00:00 2001 From: Max Wipfli Date: Sun, 17 Aug 2025 04:30:44 +0200 Subject: [PATCH] tmux: make package nullable (#7682) This makes the program.tmux.package argument nullable, allowing use of system tmux. --- modules/programs/tmux.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix index e6efb103..15fd703c 100644 --- a/modules/programs/tmux.nix +++ b/modules/programs/tmux.nix @@ -244,7 +244,7 @@ in ''; }; - package = lib.mkPackageOption pkgs "tmux" { }; + package = lib.mkPackageOption pkgs "tmux" { nullable = true; }; reverseSplit = mkOption { default = false; @@ -351,11 +351,10 @@ in config = lib.mkIf cfg.enable ( lib.mkMerge [ { - home.packages = [ - cfg.package - ] - ++ lib.optional cfg.tmuxinator.enable pkgs.tmuxinator - ++ lib.optional cfg.tmuxp.enable pkgs.tmuxp; + home.packages = + lib.optional (cfg.package != null) cfg.package + ++ lib.optional cfg.tmuxinator.enable pkgs.tmuxinator + ++ lib.optional cfg.tmuxp.enable pkgs.tmuxp; } { xdg.configFile."tmux/tmux.conf".text = lib.mkBefore tmuxConf; }