v2.3.0

Fixes #15

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ### master
 
+### v2.3.0, 2015-06-24
+- update to support \*THE\* latest tmux version
+- bugfix for `prefix + R` key binding
+- fix for tmux 2.0 `default-terminal` option (thanks @kwbr)
+
+### v2.2.0, 2015-02-10
+- bugfix in `key_binding_not_set`: the regex is now properly detecting key
+  bindings with `-r` flag.
+- enable `aggressive-resize`
+
+### v2.1.0, 2014-12-12
+- check before binding `prefix + prefix` (@m1foley)
+- enable `focus-events`
+- deprecate 'almost sensible' feature. The reason for this is to focus the
+  plugin on doing just one thing.
+
 ### v2.0.0, 2014-10-03
 - bugfix: prevent exiting tmux if 'reattach-to-user-namespace' is not installed
 - remove all mouse-related options

README.md

@@ -1,31 +1,26 @@
 # Tmux sensible
 
-A set of tmux options that should be acceptable for everyone.
+A set of tmux options that should be acceptable to everyone.
 
 Inspired by [vim-sensible](https://github.com/tpope/vim-sensible).
 
-### Core principles
+### Principles
 
-- core `tmux-sensible` options should be acceptable to **every** tmux user!<br/>
-  If any option bothers you, please open an issue and it will probably be
-  updated (or removed).
+- `tmux-sensible` options should be acceptable to **every** tmux user!<br/>
+  If any of the options bothers you, please open an issue and it will probably
+  be updated (or removed).
 - if you think a new option should be added, feel free to open a pull request.
 - **no overriding** of user defined settings.<br/>
   Your existing `.tmux.conf` settings are respected and they won't be changed.
   That way you can use `tmux-sensible` if you have a few specific options.
 
-### Almost sensible principles
-
-- widely used settings that do not make it into the 'core'
-- explicitly enabled with `set -g @almost-sensible 'on'`
-
 ### Goals
 
 - group standard tmux community options in one place
 - remove clutter from your `.tmux.conf`
 - educate new tmux users about basic options
 
-### Core options
+### Options
 
     # utf8 is on
     set -g utf8 on
@@ -53,7 +48,13 @@ Inspired by [vim-sensible](https://github.com/tpope/vim-sensible).
     # vi keys, even for vim users
     set -g status-keys emacs
 
-### Core key bindings
+    # focus events enabled for terminals that support them
+    set -g focus-events on
+
+    # super useful when using "grouped sessions" and multi-monitor setup
+    setw -g aggressive-resize on
+
+### Key bindings
 
     # easier and faster switching between next/prev window
     bind C-p previous-window
@@ -75,7 +76,13 @@ allowing you to hold `Ctrl` and repeat `a + p`/`a + n` (if your prefix is
 If prefix is `C-b`, above keys will be `C-b` and `b`.<br/>
 If prefix is `C-z`, above keys will be `C-z` and `z`... you get the idea.
 
-### Almost sensible options
+### Almost sensible options - deprecated
+
+**Note**: this feature is deprecated and will be removed from `tmux-sensible`
+in the next major release. The reason for this is to focus this plugin on doing
+just one thing (and hopefully doing it well).<br/>
+If you were using 'almost sensible' the path forward is to move all the
+below options to your `.tmux.conf`.
 
 Activate these by putting `set -g @almost-sensible 'on'` in `.tmux.conf`.
 
@@ -92,10 +99,10 @@ Activate these by putting `set -g @almost-sensible 'on'` in `.tmux.conf`.
 
 Add plugin to the list of TPM plugins in `.tmux.conf`:
 
-    set -g @tpm_plugins "             \
+    set -g @tpm_plugins '             \
       tmux-plugins/tpm                \
       tmux-plugins/tmux-sensible      \
-    "
+    '
 
 Hit `prefix + I` to fetch the plugin and source it. That's it!
 
@@ -126,6 +133,8 @@ You might also find these useful:
   improve tmux search and reduce mouse usage
 - [pain control](https://github.com/tmux-plugins/tmux-pain-control)
   useful standard bindings for controlling panes
+- [resurrect](https://github.com/tmux-plugins/tmux-resurrect)
+  persists tmux environment across system restarts
 
 ### License
 

sensible.tmux

@@ -4,6 +4,9 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 ALMOST_SENSIBLE_OPTION="@almost-sensible"
 
+# used to match output from `tmux list-keys`
+KEY_BINDING_REGEX="bind-key[[:space:]]\+\(-r[[:space:]]\+\)\?\(-T prefix[[:space:]]\+\)\?"
+
 is_osx() {
 	local platform=$(uname)
 	[ "$platform" == "Darwin" ]
@@ -41,7 +44,7 @@ server_option_value_not_changed() {
 
 key_binding_not_set() {
 	local key="$1"
-	if $(tmux list-keys | grep -q "bind-key[[:space:]]\+${key}"); then
+	if $(tmux list-keys | grep -q "${KEY_BINDING_REGEX}${key}[[:space:]]"); then
 		return 1
 	else
 		return 0
@@ -51,7 +54,7 @@ key_binding_not_set() {
 key_binding_not_changed() {
 	local key="$1"
 	local default_value="$2"
-	if $(tmux list-keys | grep -q "bind-key[[:space:]]\+${key}[[:space:]]\+${default_value}"); then
+	if $(tmux list-keys | grep -q "${KEY_BINDING_REGEX}${key}[[:space:]]\+${default_value}"); then
 		# key still has the default binding
 		return 0
 	else
@@ -59,6 +62,7 @@ key_binding_not_changed() {
 	fi
 }
 
+# "almost sensible" is deprecated
 almost_sensible_on() {
 	[ "$(tmux show-option -gvq "$ALMOST_SENSIBLE_OPTION")" == "on" ]
 }
@@ -97,16 +101,26 @@ main() {
 		tmux set-option -g default-command "reattach-to-user-namespace -l $SHELL"
 	fi
 
-	# upgrade $TERM
+	# upgrade $TERM, tmux 1.9
 	if option_value_not_changed "default-terminal" "screen"; then
 		tmux set-option -g default-terminal "screen-256color"
 	fi
+	# upgrade $TERM, tmux 2.0+
+	if server_option_value_not_changed "default-terminal" "screen"; then
+		tmux set-option -s default-terminal "screen-256color"
+	fi
 
 	# emacs key bindings in tmux command prompt (prefix + :) are better than
 	# vi keys, even for vim users
 	tmux set-option -g status-keys emacs
 
-	# ALMOST SENSIBLE OPTIONS
+	# focus events enabled for terminals that support them
+	tmux set-option -g focus-events on
+
+	# super useful when using "grouped sessions" and multi-monitor setup
+	tmux set-window-option -g aggressive-resize on
+
+	# ALMOST SENSIBLE OPTIONS - DEPRECATED
 
 	if almost_sensible_on; then
 		# C-a should be the Tmux default prefix, really
@@ -132,7 +146,9 @@ main() {
 		fi
 
 		# pressing `prefix + prefix` sends <prefix> to the shell
-		tmux bind-key "$prefix" send-prefix
+		if key_binding_not_set "$prefix"; then
+			tmux bind-key "$prefix" send-prefix
+		fi
 	fi
 
 	# If Ctrl-a is prefix then `Ctrl-a + a` switches between alternate windows.
@@ -151,7 +167,7 @@ main() {
 
 	# source `.tmux.conf` file - as suggested in `man tmux`
 	if key_binding_not_set "R"; then
-		tmux bind-key R run-shell -b ' \
+		tmux bind-key R run-shell ' \
 			tmux source-file ~/.tmux.conf > /dev/null; \
 			tmux display-message "Sourced .tmux.conf!"'
 	fi