annotate bashrc @ 29:9bce7362e609

Default to simple git push for fairly sane behaviour If we've got a new branch, Git will grumble and show us the command to copy and paste
author IBBoard <dev@ibboard.co.uk>
date Wed, 27 Jan 2016 19:39:44 +0000
parents c67aa2af6ff2
children 066d31abcee4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6
013543014cc9 Make sure we import a default bashrc file
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
1 if [ -f /etc/bashrc ]; then
013543014cc9 Make sure we import a default bashrc file
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
2 . /etc/bashrc
013543014cc9 Make sure we import a default bashrc file
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
3 fi
013543014cc9 Make sure we import a default bashrc file
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
4
8
e6a261f18fb1 Add Bash Completion sourcing
IBBoard <dev@ibboard.co.uk>
parents: 6
diff changeset
5 # Use bash-completion, if available
e6a261f18fb1 Add Bash Completion sourcing
IBBoard <dev@ibboard.co.uk>
parents: 6
diff changeset
6 if [ -f /etc/bash_completion ]; then
e6a261f18fb1 Add Bash Completion sourcing
IBBoard <dev@ibboard.co.uk>
parents: 6
diff changeset
7 . /etc/bash_completion
e6a261f18fb1 Add Bash Completion sourcing
IBBoard <dev@ibboard.co.uk>
parents: 6
diff changeset
8 fi
e6a261f18fb1 Add Bash Completion sourcing
IBBoard <dev@ibboard.co.uk>
parents: 6
diff changeset
9
20
ea572e660598 Fix Thunderbird dates and add more comments
IBBoard <dev@ibboard.co.uk>
parents: 19
diff changeset
10 # Use a sane editor
0
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
11 export EDITOR=/usr/bin/nano
24
acbc487533ab Consistently fix Thunderbird time settings by moving some bits to profile, not bashrc
IBBoard <dev@ibboard.co.uk>
parents: 20
diff changeset
12
acbc487533ab Consistently fix Thunderbird time settings by moving some bits to profile, not bashrc
IBBoard <dev@ibboard.co.uk>
parents: 20
diff changeset
13 #Import aliases
0
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
14 test -s ~/.alias && . ~/.alias || true
20
ea572e660598 Fix Thunderbird dates and add more comments
IBBoard <dev@ibboard.co.uk>
parents: 19
diff changeset
15
ea572e660598 Fix Thunderbird dates and add more comments
IBBoard <dev@ibboard.co.uk>
parents: 19
diff changeset
16 # Add sbins to path to make life easier (e.g. /sbin/ifconfig)
0
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
17 export PATH=/sbin:/usr/sbin:/usr/local/sbin:$PATH
20
ea572e660598 Fix Thunderbird dates and add more comments
IBBoard <dev@ibboard.co.uk>
parents: 19
diff changeset
18
ea572e660598 Fix Thunderbird dates and add more comments
IBBoard <dev@ibboard.co.uk>
parents: 19
diff changeset
19 #Disable man page number prompts - where there's more than one, we normally want the default (user command) version
0
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
20 export MAN_POSIXLY_CORRECT=1
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
21
19
170de0d0d6dd Stop less creating a history file
IBBoard <dev@ibboard.co.uk>
parents: 8
diff changeset
22 #Disable less history, because do I really search the same things enough to use it across sessions?
170de0d0d6dd Stop less creating a history file
IBBoard <dev@ibboard.co.uk>
parents: 8
diff changeset
23 export LESSHISTFILE=-
170de0d0d6dd Stop less creating a history file
IBBoard <dev@ibboard.co.uk>
parents: 8
diff changeset
24
24
acbc487533ab Consistently fix Thunderbird time settings by moving some bits to profile, not bashrc
IBBoard <dev@ibboard.co.uk>
parents: 20
diff changeset
25 export XDG_CACHE_HOME="$HOME/.cache"
acbc487533ab Consistently fix Thunderbird time settings by moving some bits to profile, not bashrc
IBBoard <dev@ibboard.co.uk>
parents: 20
diff changeset
26
0
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
27 if [ "$PS1" != "" -a "${STARTED_TMUX:-x}" = x -a "${SSH_TTY:-x}" != x ]
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
28 then
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
29 STARTED_TMUX=1; export STARTED_TMUX
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
30 sleep 1
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
31 ( (tmux has-session -t remote && tmux attach-session -t remote) || (tmux new-session -s remote) ) && exit 0
27e8e563b02b * First config files
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
32 echo "tmux failed to start"
6
013543014cc9 Make sure we import a default bashrc file
IBBoard <dev@ibboard.co.uk>
parents: 0
diff changeset
33 fi
27
c67aa2af6ff2 Switch to ibus, because it is simpler than uim but does XCompose
IBBoard <dev@ibboard.co.uk>
parents: 24
diff changeset
34
c67aa2af6ff2 Switch to ibus, because it is simpler than uim but does XCompose
IBBoard <dev@ibboard.co.uk>
parents: 24
diff changeset
35 export GTK_IM_MODULE=ibus