From 62f2f72e98453e0060c38d98930d2a3eabefeaae Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 28 Jul 2016 19:10:42 +0800
Subject: tmux module: do not override keys by default in VI mode (#17330)

We want to stick to upstream defaults as much as possible.

As pointed out by @8573 in #16999, this was not the case.
---
 nixos/modules/programs/tmux.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index cadf8d4ae10..f0f8d03505a 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -27,7 +27,7 @@ let
     set -g status-keys ${cfg.keyMode}
     set -g mode-keys   ${cfg.keyMode}
 
-    ${if cfg.keyMode == "vi" then ''
+    ${if cfg.keyMode == "vi" && cfg.customPaneNavigationAndResize then ''
     bind h select-pane -L
     bind j select-pane -D
     bind k select-pane -U
@@ -86,6 +86,13 @@ in {
         description = "Use 24 hour clock.";
       };
 
+      customPaneNavigationAndResize = mkOption {
+        default = false;
+        example = true;
+        type = types.bool;
+        description = "Override the hjkl and HJKL bindings for pane navigation and resizing in VI mode.";
+      };
+
       escapeTime = mkOption {
         default = 500;
         example = 0;
-- 
cgit 1.4.1