comparison bashrc @ 55:231b9b290bfb

Merge accidental heads
author IBBoard <dev@ibboard.co.uk>
date Sat, 25 Mar 2017 11:15:14 +0000
parents 6b500877a2fc
children 3c48c5671f1a
comparison
equal deleted inserted replaced
48:39bdd245431b 55:231b9b290bfb
9 9
10 # Use a sane editor 10 # Use a sane editor
11 export EDITOR=/usr/bin/nano 11 export EDITOR=/usr/bin/nano
12 12
13 # Set 256-colour terminal support 13 # Set 256-colour terminal support
14 export TERM="xterm-256color" 14 export TERM="screen-256color"
15 15
16 #Import aliases 16 #Import aliases
17 test -s ~/.alias && . ~/.alias || true 17 test -s ~/.alias && . ~/.alias || true
18 18
19 # Add sbins to path to make life easier (e.g. /sbin/ifconfig) 19 # Add sbins to path to make life easier (e.g. /sbin/ifconfig)
34 ( (tmux has-session -t remote && tmux attach-session -t remote) || (tmux new-session -s remote) ) && exit 0 34 ( (tmux has-session -t remote && tmux attach-session -t remote) || (tmux new-session -s remote) ) && exit 0
35 echo "tmux failed to start" 35 echo "tmux failed to start"
36 fi 36 fi
37 37
38 export GTK_IM_MODULE=ibus 38 export GTK_IM_MODULE=ibus
39 export LS_OPTIONS="$LS_OPTIONS -p"