Commit ac7a9e28 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'auto-tmux-refactor'

parents 0b3d8fd2 702c67c3

.bash_profile

+0 −4
Original line number Diff line number Diff line
@@ -17,9 +17,5 @@ if [ -n "$PS1" ]; then 
	export PS1

fi



# Automatically run terminal multiplexer on SSH connect

[[ -n "$SSH_TTY" ]] && ! [[ "$TERM" =~ ^(screen|tmux) ]] && has tmux &&

	exec ~/.shell/bin/tmux-display-helper start-client



# Get Bash aliases and functions

source_first ~/.bashrc /etc/bash.bashrc /etc/bashrc

.profile

+7 −0
Original line number Diff line number Diff line 
. ~/.shell/funcs

. ~/.shell/colours



# Automatically run terminal multiplexer on SSH connect

case $TERM in

	screen*|tmux*) ;;

	*) [ -n "$SSH_TTY" ] && [ -z "$TMUX" ] && has tmux &&

		exec ~/.shell/bin/tmux-display-helper start-client ;;

esac



# Environment variables

export HISTIGNORE="&:ls:[bf]g:d[fu]:exit"

export WORKON_HOME=~/.virtualenvs

.ssh/config

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ GSSAPIAuthentication no 
CanonicalizeHostname yes

CanonicalDomains net.kodo.org.uk kodo.org.uk actual-experience.com



SendEnv LANG LC_*

SendEnv LANG LC_* TMUX



# === General Identities ===

Host mbp-0095.* MBP-0095.*

.zprofile

+0 −4
Original line number Diff line number Diff line
@@ -2,7 +2,3 @@ source ~/.shell/funcs 


# Source all-shell startup profile environments

source_each ~/.profile ~/.profile_local
 


# Automatically run terminal multiplexer on SSH connect

[[ -n "$SSH_TTY" ]] && ! [[ "$TERM" =~ ^(screen|tmux) ]] && has tmux &&

	exec ~/.shell/bin/tmux-display-helper start-client