Browse code
merging
Ed L authored on 14/07/2014 20:21:28
Showing 4 changed files
Showing 4 changed files
... | ... |
@@ -3,6 +3,7 @@ echo ".zshrc loaded for $USER on $TTY at `date`" | logger |
3 | 3 |
|
4 | 4 |
# Path to your oh-my-zsh configuration. |
5 | 5 |
export ZSH=$HOME/.oh-my-zsh |
6 |
+export MPD_HOST=fiddlerwoaroof.no-ip.biz |
|
6 | 7 |
|
7 | 8 |
# Set name of the theme to load. |
8 | 9 |
# Look in ~/.oh-my-zsh/themes/ |
... | ... |
@@ -19,11 +20,11 @@ export ZSH=$HOME/.oh-my-zsh |
19 | 20 |
# export DISABLE_LS_COLORS="true" |
20 | 21 |
|
21 | 22 |
# Uncomment following line if you want to disable autosetting terminal title. |
22 |
-export DISABLE_AUTO_TITLE="true" |
|
23 |
+#export DISABLE_AUTO_TITLE="true" |
|
23 | 24 |
|
24 | 25 |
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) |
25 | 26 |
# Example format: plugins=(rails git textmate ruby lighthouse) |
26 |
-plugins=(git ruby rails osx brew zsh-syntax-highlighting python git-extra git-flow) |
|
27 |
+plugins=(git ruby rails osx brew zsh-syntax-highlighting python git-extra git-flow battery) |
|
27 | 28 |
|
28 | 29 |
source $ZSH/oh-my-zsh.sh |
29 | 30 |
unsetopt correct_all |
... | ... |
@@ -58,14 +59,14 @@ export PS1 |
58 | 59 |
RPROMPT="[%T]" |
59 | 60 |
export RPROMPT |
60 | 61 |
HOSTNAME=`hostname -f` |
61 |
-PROMPT_COMMAND='echo -ne "\033]0;${USER}@$HOSTNAME: ${PWD}\007"' |
|
62 |
+PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"' |
|
62 | 63 |
|
63 | 64 |
cmdtermtitle() { |
64 | 65 |
echo -ne "\033]0;${USER}@$HOSTNAME: $1\007" |
65 | 66 |
} |
66 | 67 |
|
67 | 68 |
if [[ $TERM != "linux" ]]; then |
68 |
- # add-zsh-hook preexec cmdtermtitle |
|
69 |
+ add-zsh-hook preexec cmdtermtitle |
|
69 | 70 |
fi |
70 | 71 |
|
71 | 72 |
termtitle() { |
... | ... |
@@ -261,8 +262,12 @@ archive() { |
261 | 262 |
echo done. |
262 | 263 |
} |
263 | 264 |
editrc() { |
265 |
+ hash=`md5 $HOME/.zshrc` |
|
264 | 266 |
$VISUAL $HOME/.zshrc |
265 |
- source $HOME/.zshrc |
|
267 |
+ newhash=`md5 $HOME/.zshrc` |
|
268 |
+ if [[ $hash != $newhash ]]; then |
|
269 |
+ source $HOME/.zshrc |
|
270 |
+ fi |
|
266 | 271 |
} |
267 | 272 |
rl() { source $HOME/.zshrc } |
268 | 273 |
getlink() { #gtdo |
... | ... |
@@ -274,7 +279,7 @@ copypwd() { echo -n `pwd` | pbcopy } |
274 | 279 |
alias sdir='copypwd' |
275 | 280 |
|
276 | 281 |
sshto() { |
277 |
- TARGET=`egrep ^$1: ~/.ssh_dests | cut -d: -f2` |
|
282 |
+ TARGET=`egrep "^$1:" ~/.ssh_dests | cut -d: -f2` |
|
278 | 283 |
USER=`grep $TARGET ~/.ssh_dests | cut -d: -f3` |
279 | 284 |
ssh $USER@$TARGET |
280 | 285 |
} |