mirror of
https://github.com/nix-community/home-manager.git
synced 2026-01-11 09:29:41 +08:00
tmux: make package nullable (#7682)
This makes the program.tmux.package argument nullable, allowing use of system tmux.
This commit is contained in:
@@ -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; }
|
||||
|
||||
Reference in New Issue
Block a user