diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2023-10-17 14:31:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-17 14:31:38 +0200 |
| commit | fac3684647cc9d6dfb2a39f3f4b7cf5fc89c96b6 (patch) | |
| tree | 64fe50dfab8b99f8cc00a0e96417d489cad3eb7a | |
| parent | linux/hardened/patches/4.14: 4.14.326-hardened1 -> 4.14.327-hardened1 (diff) | |
| parent | tmux: add extraConfigBeforePlugins (diff) | |
| download | nixpkgs-fac3684647cc9d6dfb2a39f3f4b7cf5fc89c96b6.tar.gz | |
Merge pull request #260858 from codedownio/backport-tmux-run-plugins-last
| -rw-r--r-- | nixos/modules/programs/tmux.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index 4f452f1d7f9b..0d1c7c9cdf0f 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -52,6 +52,8 @@ let set -s escape-time ${toString cfg.escapeTime} set -g history-limit ${toString cfg.historyLimit} + ${cfg.extraConfigBeforePlugins} + ${lib.optionalString (cfg.plugins != []) '' # Run plugins ${lib.concatMapStringsSep "\n" (x: "run-shell ${x.rtp}") cfg.plugins} @@ -108,10 +110,18 @@ in { description = lib.mdDoc "Time in milliseconds for which tmux waits after an escape is input."; }; + extraConfigBeforePlugins = mkOption { + default = ""; + description = lib.mdDoc '' + Additional contents of /etc/tmux.conf, to be run before sourcing plugins. + ''; + type = types.lines; + }; + extraConfig = mkOption { default = ""; description = lib.mdDoc '' - Additional contents of /etc/tmux.conf + Additional contents of /etc/tmux.conf, to be run after sourcing plugins. ''; type = types.lines; }; |