diff options
| -rw-r--r-- | .bashrc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/.bashrc b/.bashrc index 82120db..024a0b1 100644 --- a/.bashrc +++ b/.bashrc @@ -8,6 +8,8 @@ if [[ $- != *i* ]]; then fi export HOSTNAME=${HOSTNAME:-$(hostname -s)} +# need -s above for BSD, but that returns localhost on some linuxen +[[ "x${HOSTNAME}" == "xlocalhost" ]] && export HOSTNAME=$(hostname) export HOST=$HOSTNAME export USER=${USER:-$(whoami)} @@ -29,7 +31,7 @@ do_interesting_prompt() { tyr_col='\[\e[0;36m\]' basil_col='\[\e[0;33m\]' gendros_col='\[\e[1;37m\]' - raspi_col='\[\033[01;32m\]' + mnason_col='\[\033[01;32m\]' host_col=$reset_col # TODO make all of these unique again @@ -41,16 +43,14 @@ do_interesting_prompt() { [[ "x$HOST" == "xgendros" ]] && host_col=$gendros_col [[ "x$HOST" == "xCHESTER" ]] && host_col=$gendros_col [[ "x$HOST" == "xtriton" ]] && host_col=$gendros_col - [[ "x$HOST" == "xraspberrypi" ]] && host_col=$raspi_col + [[ "x$HOST" == "xmnason" ]] && host_col=$mnason_col djm_col='\[\e[0;32m\]' - pi_col='\[\e[1;37m\]' wiz_col='\[\e[1;32m\]' deejayem_col='\[\e[1;32m\]' user_col=$reset_col [[ "x$USER" == "xdjm" ]] && user_col=$djm_col - [[ "x$USER" == "xpi" ]] && user_col=$pi_col [[ "x$USER" == "xwizard" ]] && user_col=$wiz_col [[ "x$USER" == "xdeejayem" ]] && user_col=$deejayem_col [[ "x$USER" == "xdavidmo" ]] && user_col=$deejayem_col @@ -175,8 +175,6 @@ set -C #export NNTPSERVER=news.individual.net #export NNTPSERVER=public.teranews.com #export NNTPSERVER=reader.news4all.se -export HOSTNAME=`hostname -s` -export HOST=$HOSTNAME [ -f /usr/bin/vim ] && export EDITOR=/usr/bin/vim [ -f /usr/local/bin/vim ] && export EDITOR=/usr/local/bin/vim export PAGER=/usr/bin/less @@ -236,8 +234,7 @@ alias msearchfilename='mpc search filename' alias mupdate='mpc update' #source ~/bashmp.sh -keychain ~/.ssh/id_dsa -keychain ~/.ssh/id_rsa +keychain ~/.ssh/id_dsa ~/.ssh/id_rsa #. ~/.keychain/${HOSTNAME}-sh-gpg . ~/.keychain/${HOSTNAME}-sh @@ -377,7 +374,7 @@ alias hadd='run_cmd $(history -p ^diff^add)' alias dogs='run_cmd docker ps; run_cmd docker logs -f $(docker ps|sed 1d|awk '"'"'{print $1;}'"'"')' alias undock='sudo umount `mount|grep -o "/var/lib/docker/aufs/mnt/[a-z0-9]*"`' -#alias gp="chdir ${VIEW_DIR} ; run_cmd git pull ; chdir" +#alias gp="chdir ${VIEW_DIR} ; run_cmd git pull --rebase ; chdir" #alias gs="chdir ${VIEW_DIR} ; run_cmd git stash ; chdir" #alias gsp="chdir ${VIEW_DIR} ; run_cmd git stash pop ; chdir" #alias gstat="chdir ${VIEW_DIR} ; run_cmd git -c color.status=always status | less -RXF ; chdir" @@ -541,6 +538,13 @@ if [[ "x$OS" == "xWindows_NT" ]]; then [[ -d $WIN_HOME/workspaces ]] && export WORKSPACES=$WIN_HOME/workspaces fi +if [ -f ~/.fzf.bash ]; then + . ~/.fzf.bash +else + [ -f /usr/share/fzf/completion.bash ] && . /usr/share/fzf/completion.bash + [ -f /usr/share/fzf/key-bindings.bash ] && . /usr/share/fzf/key-bindings.bash +fi + true # vim: set et ts=4 tw=120 : |