diff options
| author | Nathan Lasseter <nathan.je.lasseter@googlemail.com> | 2013-04-28 12:25:50 +0100 |
|---|---|---|
| committer | Nathan Lasseter <nathan.je.lasseter@googlemail.com> | 2013-04-28 12:25:50 +0100 |
| commit | cf69484245fa915dff7c76d22e600c926ca43200 (patch) | |
| tree | f7ab1bf5e36861f83b81e7c0364eea33692f6b1b | |
| parent | ca0e20bdfe8ba9106900fe5c3bc0b3b713760cae (diff) | |
Fixed git prompt and changed aliases
| -rw-r--r-- | config.fish | 8 | ||||
| -rw-r--r-- | functions/fish_prompt.fish | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/config.fish b/config.fish index 9405af8..aa1b513 100644 --- a/config.fish +++ b/config.fish @@ -1,9 +1,11 @@ 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 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/ +alias what='ps -ef' +alias when='uptime' + +set -x PATH /home/nathan/bin $PATH /opt/adk/platform-tools set -x EDITOR vim set -x CDPATH '.' +set -x STEAM_FRAME_FORCE_CLOSE 1 diff --git a/functions/fish_prompt.fish b/functions/fish_prompt.fish index 51dbbd7..9be04c2 100644 --- a/functions/fish_prompt.fish +++ b/functions/fish_prompt.fish @@ -4,10 +4,12 @@ function fish_prompt printf '@' printf '%s%s%s' (set_color green) (cat /etc/hostname) (set_color normal) printf '] ' - printf '%s%s' (set_color red) (pwd) + + printf '%s%s%s' (set_color red) (pwd) (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) + printf ' {%s}' (git branch | grep '\*' | awk -F\ '{print $2}') end + + printf '>: ' end |