diff options
| author | Nathan Lasseter <nathan.je.lasseter@googlemail.com> | 2012-12-13 19:48:12 +0000 |
|---|---|---|
| committer | Nathan Lasseter <nathan.je.lasseter@googlemail.com> | 2012-12-13 19:48:12 +0000 |
| commit | 81c5f1b53a1cf5f5fa9aa37a895a9a84b2d2abbb (patch) | |
| tree | 39b6ac304a4e2497dce8375b913f5d1fd329452b | |
| parent | e7b48b0663b3879e1d31aa604652c635493b5ca4 (diff) | |
| parent | 79d992cf0c206011a878db55f40ea595a4977973 (diff) | |
Merge branch 'master' of github.com:User4574/FISh-Configs
Conflicts:
config.fish
| -rw-r--r-- | config.fish | 2 | ||||
| -rw-r--r-- | functions/fish_prompt.fish | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config.fish b/config.fish index 6a2a135..16104e9 100644 --- a/config.fish +++ b/config.fish @@ -1,8 +1,8 @@ alias she='ssh njel500@milan.cs.york.ac.uk' alias sft='sftp njel500@milan.cs.york.ac.uk' alias shx='ssh -YC njel500@milan.cs.york.ac.uk' -alias 4574='ssh 4574' alias pcorr='chmod -R a+rX,u+w .' +alias 4574='ssh nathan@4574.co.uk' set -x PATH /home/nathan/bin $PATH /opt/android-sdk-linux_x86/platform-tools/ set -x EDITOR vim diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish index 84c7e83..51dbbd7 100644 --- a/functions/fish_prompt.fish +++ b/functions/fish_prompt.fish @@ -5,5 +5,9 @@ function fish_prompt printf '%s%s%s' (set_color green) (cat /etc/hostname) (set_color normal) printf '] ' printf '%s%s' (set_color red) (pwd) - printf '%s>: ' (set_color normal) + if git status >/dev/null ^/dev/null + printf '%s {%s}>: ' (set_color normal) (git branch | awk -F\ '{print $2}') + else + printf '%s>: ' (set_color normal) + end end |