From 6d483ab1543e493f9e5683b197c49e3a542c5a70 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 19 Dec 2016 11:59:58 +1300
Subject: OK, I'm pretty sure this is the reight arrangement

---
 tmux/tmux.conf.m4 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tmux')

diff --git a/tmux/tmux.conf.m4 b/tmux/tmux.conf.m4
index 97a9f2b4..a10990c1 100644
--- a/tmux/tmux.conf.m4
+++ b/tmux/tmux.conf.m4
@@ -8,12 +8,16 @@ set-environment -gru SSH_CONNECTION
 set-environment -gru SSH_TTY
 set-environment -gru WINDOWID
 
+# Reset SHLVL
+set-environment -gru SHLVL
+
 # Otherwise, use the environment we had when we started; don't touch it during
 # a session unless I specifically ask
 set-option -g update-environment ''
 
 # Setting this makes each new pane a non-login shell, which suits me better
-set-option -g default-command "unset SHLVL ; exec $SHELL"
+set-option -g default-command "exec $SHELL"
+set-option -g default-shell "/bin/sh"
 
 # Expect a 256-color terminal
 set-option -g default-terminal 'screen-256color'
-- 
cgit v1.2.3