From 701a7fbe51aa07d1029c937ebd64bb4345080588 Mon Sep 17 00:00:00 2001
From: Von Random <von@mechanus.net>
Date: Thu, 11 Jun 2015 14:56:16 +0300
Subject: [PATCH] unify tmux config

---
 shellrc   | 3 +++
 tmux.conf | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shellrc b/shellrc
index 0bb314a..41b697d 100644
--- a/shellrc
+++ b/shellrc
@@ -23,6 +23,7 @@ dotfiles="${HOME}/vdotfiles"
 comp_enabled=true
 vcs_enabled=true
 
+export SSH_AUTH_SOCKET="${HOME}/.ssh/ssh_auth_socket"
 export TIME_STYLE='long-iso'
 export LANG='en_US.UTF-8'
 export LC_TIME='en_DK.UTF-8'
@@ -116,6 +117,8 @@ seconds-to-hr() {
 		printf '%sd %sh %sm %ss\n' $d $h $m $s
 	fi
 }
+
+tmuxrc() { tmux source-file "${HOME}/.tmux.conf"; tmux display-message "Config reloaded."; }
 # }}}
 if is_zsh; then
 # zsh
diff --git a/tmux.conf b/tmux.conf
index 6250690..856f795 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,8 +1,8 @@
 # vim: ft=tmux
 unbind C-b
+set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
 set -g prefix C-Space
 bind C-Space send-prefix
-bind r source-file /home/von/.tmux.conf\; display-message "Config reloaded."
 bind s split-window -v
 bind v split-window -h
 bind h select-pane -L
@@ -32,7 +32,6 @@ set -g status-left-length 20
 set -g status-right-length 40
 set -g monitor-activity on
 set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@"
-set -g default-terminal "screen-256color"
 
 set -g status-bg "colour0"
 set -g message-command-fg "colour7"