From f83dc9f25a5915c70b013102e30f3ee2a72ba633 Mon Sep 17 00:00:00 2001 From: Gen <54583542+gen740@users.noreply.github.com> Date: Thu, 28 Nov 2024 19:30:10 +0900 Subject: [PATCH] tmux: set `sensibleOnTop = false` as a default Fixes #5952 --- modules/programs/tmux.nix | 2 +- tests/modules/programs/tmux/default-shell.conf | 5 ----- tests/modules/programs/tmux/disable-confirmation-prompt.conf | 5 ----- tests/modules/programs/tmux/emacs-with-plugins.conf | 5 ----- tests/modules/programs/tmux/mouse-enabled.conf | 5 ----- tests/modules/programs/tmux/prefix.conf | 5 ----- tests/modules/programs/tmux/shortcut-without-prefix.conf | 5 ----- tests/modules/programs/tmux/vi-all-true.conf | 5 ----- 8 files changed, 1 insertion(+), 36 deletions(-) diff --git a/modules/programs/tmux.nix b/modules/programs/tmux.nix index b68fd8d5e..38a184c94 100644 --- a/modules/programs/tmux.nix +++ b/modules/programs/tmux.nix @@ -239,7 +239,7 @@ in { sensibleOnTop = mkOption { type = types.bool; - default = true; + default = false; description = '' Run the sensible plugin at the top of the configuration. It is possible to override the sensible settings using the diff --git a/tests/modules/programs/tmux/default-shell.conf b/tests/modules/programs/tmux/default-shell.conf index 8eb4e40fa..473ec0d6f 100644 --- a/tests/modules/programs/tmux/default-shell.conf +++ b/tests/modules/programs/tmux/default-shell.conf @@ -1,8 +1,3 @@ -# ============================================= # -# Start with defaults from the Sensible plugin # -# --------------------------------------------- # -run-shell @sensible_rtp@ -# ============================================= # set -g default-terminal "screen" set -g base-index 0 diff --git a/tests/modules/programs/tmux/disable-confirmation-prompt.conf b/tests/modules/programs/tmux/disable-confirmation-prompt.conf index b4359316c..0adb521fb 100644 --- a/tests/modules/programs/tmux/disable-confirmation-prompt.conf +++ b/tests/modules/programs/tmux/disable-confirmation-prompt.conf @@ -1,8 +1,3 @@ -# ============================================= # -# Start with defaults from the Sensible plugin # -# --------------------------------------------- # -run-shell @sensible_rtp@ -# ============================================= # set -g default-terminal "screen" set -g base-index 0 diff --git a/tests/modules/programs/tmux/emacs-with-plugins.conf b/tests/modules/programs/tmux/emacs-with-plugins.conf index 54ddce136..556a682df 100644 --- a/tests/modules/programs/tmux/emacs-with-plugins.conf +++ b/tests/modules/programs/tmux/emacs-with-plugins.conf @@ -1,8 +1,3 @@ -# ============================================= # -# Start with defaults from the Sensible plugin # -# --------------------------------------------- # -run-shell @tmuxplugin_sensible_rtp@ -# ============================================= # set -g default-terminal "screen" set -g base-index 0 diff --git a/tests/modules/programs/tmux/mouse-enabled.conf b/tests/modules/programs/tmux/mouse-enabled.conf index 2069920de..2fcd9f54a 100644 --- a/tests/modules/programs/tmux/mouse-enabled.conf +++ b/tests/modules/programs/tmux/mouse-enabled.conf @@ -1,8 +1,3 @@ -# ============================================= # -# Start with defaults from the Sensible plugin # -# --------------------------------------------- # -run-shell @sensible_rtp@ -# ============================================= # set -g default-terminal "screen" set -g base-index 0 diff --git a/tests/modules/programs/tmux/prefix.conf b/tests/modules/programs/tmux/prefix.conf index 00f950e09..3bc7c63ac 100644 --- a/tests/modules/programs/tmux/prefix.conf +++ b/tests/modules/programs/tmux/prefix.conf @@ -1,8 +1,3 @@ -# ============================================= # -# Start with defaults from the Sensible plugin # -# --------------------------------------------- # -run-shell @sensible_rtp@ -# ============================================= # set -g default-terminal "screen" set -g base-index 0 diff --git a/tests/modules/programs/tmux/shortcut-without-prefix.conf b/tests/modules/programs/tmux/shortcut-without-prefix.conf index 938ecfa82..e3c27610a 100644 --- a/tests/modules/programs/tmux/shortcut-without-prefix.conf +++ b/tests/modules/programs/tmux/shortcut-without-prefix.conf @@ -1,8 +1,3 @@ -# ============================================= # -# Start with defaults from the Sensible plugin # -# --------------------------------------------- # -run-shell @sensible_rtp@ -# ============================================= # set -g default-terminal "screen" set -g base-index 0 diff --git a/tests/modules/programs/tmux/vi-all-true.conf b/tests/modules/programs/tmux/vi-all-true.conf index 03bf2f5a1..3bcc51ddd 100644 --- a/tests/modules/programs/tmux/vi-all-true.conf +++ b/tests/modules/programs/tmux/vi-all-true.conf @@ -1,8 +1,3 @@ -# ============================================= # -# Start with defaults from the Sensible plugin # -# --------------------------------------------- # -run-shell @sensible_rtp@ -# ============================================= # set -g default-terminal "screen" set -g base-index 0