diff options
-rw-r--r-- | config.fish | 4 | ||||
-rw-r--r-- | functions/fish_prompt.fish | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config.fish b/config.fish index c5cfb32..41e894c 100644 --- a/config.fish +++ b/config.fish @@ -2,8 +2,6 @@ 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 nathan@4574.co.uk' -alias umnt='fusermount -u ~/mnt' alias grope='ping' -set -x PATH /home/nathan/bin $PATH /opt/android-sdk-linux_x86/platform-tools/# /opt/moterunner/linux/bin/ -#set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /opt/moterunner/linux/bin/ +set -x PATH /home/nathan/bin $PATH /opt/android-sdk-linux_x86/platform-tools/ 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 |