made default-command use the value of default-shell

This commit is contained in:
Gregory Pakosz 2016-11-23 16:37:27 +01:00
parent 1bfce57aaa
commit 37586cdd60
1 changed files with 8 additions and 4 deletions

View File

@ -28,9 +28,6 @@ bind e new-window -n '~/.tmux.conf.local' "sh -c '\${EDITOR:-vim} ~/.tmux.conf.l
# reload configuration # reload configuration
bind r source-file ~/.tmux.conf \; display '~/.tmux.conf sourced' bind r source-file ~/.tmux.conf \; display '~/.tmux.conf sourced'
# see https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard
if 'type -p reattach-to-user-namespace > /dev/null 2>&1' 'set -g default-command "exec $SHELL... 2> /dev/null & reattach-to-user-namespace $SHELL -l"'
# -- display ------------------------------------------------------------------- # -- display -------------------------------------------------------------------
@ -134,7 +131,7 @@ bind -t vi-copy H start-of-line
bind -t vi-copy L end-of-line bind -t vi-copy L end-of-line
# copy to Mac OSX pasteboard # copy to Mac OSX pasteboard
if -b 'type -p reattach-to-user-namespace > /dev/null 2>&1' 'bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy"' if -b 'command -v reattach-to-user-namespace > /dev/null 2>&1' 'bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy"'
# -- user defined overrides ---------------------------------------------------- # -- user defined overrides ----------------------------------------------------
@ -1012,6 +1009,13 @@ run 'cut -c3- ~/.tmux.conf | sh -s _apply_configuration'
# } # }
# #
# _apply_configuration() { # _apply_configuration() {
#
# # see https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard
# if command -v reattach-to-user-namespace > /dev/null 2>&1; then
# default_shell="$(tmux show -gv default-shell)"
# tmux set -g default-command "exec $default_shell... 2> /dev/null & reattach-to-user-namespace $default_shell -l"
# fi
#
# _apply_overrides # _apply_overrides
# _apply_bindings # _apply_bindings
# _apply_theme # _apply_theme