From bef09488b972c84c7f1e861b3e82bc7b527453d9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 19 Mar 2017 16:27:25 -0400 Subject: [PATCH] shell/tmux: prevent zsh from being run twice on startup --- shell/tmux/.tmux.conf | 4 ---- shell/tmux/.tmux/osx.conf | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/shell/tmux/.tmux.conf b/shell/tmux/.tmux.conf index 8c8f38eb..df913aab 100644 --- a/shell/tmux/.tmux.conf +++ b/shell/tmux/.tmux.conf @@ -2,7 +2,6 @@ set -g default-terminal screen-256color set -g default-shell $SHELL -set -g default-command $SHELL set -s quiet on set -s focus-events on # increase scrollback buffer size @@ -176,9 +175,6 @@ bind -t vi-copy Escape cancel bind -t vi-copy H start-of-line bind -t vi-copy L end-of-line -# 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"' - # -- THEME ------------------------------- diff --git a/shell/tmux/.tmux/osx.conf b/shell/tmux/.tmux/osx.conf index 7917ccae..23c04801 100755 --- a/shell/tmux/.tmux/osx.conf +++ b/shell/tmux/.tmux/osx.conf @@ -1,2 +1,3 @@ -set -g default-command "reattach-to-user-namespace -l zsh" +# 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"'