diff options
Diffstat (limited to 'bash/bashrc')
| -rw-r--r-- | bash/bashrc | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/bash/bashrc b/bash/bashrc index 5d89e1a..c7f0e66 100644 --- a/bash/bashrc +++ b/bash/bashrc @@ -20,36 +20,9 @@ HISTFILESIZE=2000 # update the values of LINES and COLUMNS. shopt -s checkwinsize -# enable color support of ls and also add handy aliases -if [ "$TERM" != "dumb" ]; then - eval "`dircolors -b`" - alias ls='ls --color=auto' - alias dir='ls --color=auto --format=vertical' - alias vdir='ls --color=auto --format=long' -fi - -# some more ls aliases -alias ll='ls -l' -alias la='ls -A' -alias lla='ls -la' -alias llh='ls -lh' -alias grep='grep --color=auto' -alias cp='cp -i' -alias rm='rm -i' -alias mv='mv -i' -alias ..='cd ..' - export EDITOR=vim export PATH=${PATH}:~/bin -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" -a -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# Comment in the above and uncomment this below for a color prompt -PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' - # If this is an xterm set the title to user@host:dir case "$TERM" in xterm*|rxvt*) @@ -59,6 +32,21 @@ xterm*|rxvt*) ;; esac +function _update_ps1() { + export PS1="$(~/bin/powerline-shell.py $? 2> /dev/null)" +} + +export PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" + +# Setup ssh-agent +SSHAGENT=/usr/bin/ssh-agent +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + + # Alias definitions. # You may want to put all your additions into a separate file like # ~/.bash_aliases, instead of adding them here directly. |