aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2018-02-23 21:41:33 +0100
committerDavid Runge <dave@sleepmap.de>2018-02-23 21:41:33 +0100
commit484c498cf10213d5ab810263726478b3c705b3dc (patch)
treea2a3adc53b364f02ab6ff1337298f6f7801e7372
parent3906f3f7d04e37461415365b812ffdf10c161c40 (diff)
parent2d27ea5a44264dd1bb3a4aaf1e402ba1a7fae1bc (diff)
downloaddotfiles-484c498cf10213d5ab810263726478b3c705b3dc.tar.gz
dotfiles-484c498cf10213d5ab810263726478b3c705b3dc.tar.bz2
dotfiles-484c498cf10213d5ab810263726478b3c705b3dc.tar.xz
dotfiles-484c498cf10213d5ab810263726478b3c705b3dc.zip
Merge branch 'master' of sleepmap.de:config/dotfiles
* 'master' of sleepmap.de:config/dotfiles: .zsh.after/export.zsh: Fixing export of TERM for tmux and screen. .tmux.conf: Switching to tmux-256color for within tmux.
-rw-r--r--.tmux.conf2
-rw-r--r--.zsh.after/export.zsh2
2 files changed, 3 insertions, 1 deletions
diff --git a/.tmux.conf b/.tmux.conf
index 2e1a4d3..16c3173 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,7 +1,7 @@
# Ring the bell if any background window rang a bell
set -g bell-action any
-set -g default-terminal "screen-256color"
+set -g default-terminal "tmux-256color"
# split windows like vim
# vim's definition of a horizontal/vertical split is reversed from tmux's
diff --git a/.zsh.after/export.zsh b/.zsh.after/export.zsh
index 74f1b41..dcc16b9 100644
--- a/.zsh.after/export.zsh
+++ b/.zsh.after/export.zsh
@@ -1,5 +1,7 @@
# use xterm-color anywhere. Sane default for color and termite
if [[ -n $TMUX ]];then
+ export TERM="tmux-256color"
+elif [[ -n $STY ]];then
export TERM="screen-256color"
else
export TERM="xterm-256color"