|
|
@@ -68,6 +68,25 @@ export EDITOR=vim
|
|
|
export MANPAGER="/bin/sh -c \"col -bx | vim -c 'set ft=man' -\""
|
|
|
export GREP_COLORS='ms=01;36:mc=01;31:sl=:cx=:fn=35:ln=33:bn=33:se=01;34'
|
|
|
|
|
|
+SSH_ENV="$HOME/.ssh/environment"
|
|
|
+function start_agent {
|
|
|
+ ssh-agent > "$SSH_ENV"
|
|
|
+ chmod 600 "$SSH_ENV"
|
|
|
+ . "$SSH_ENV" > /dev/null
|
|
|
+ ssh-add
|
|
|
+}
|
|
|
+if [ -f "$SSH_ENV" ]; then
|
|
|
+ . "$SSH_ENV" > /dev/null
|
|
|
+fi
|
|
|
+if [ -n "$SSH_AGENT_PID" ]; then
|
|
|
+ ps ${SSH_AGENT_PID} > /dev/null
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
+ start_agent
|
|
|
+ fi
|
|
|
+else
|
|
|
+ start_agent
|
|
|
+fi
|
|
|
+
|
|
|
alias ls='ls --color=auto -hv --group-directories-first'
|
|
|
alias ll='ls -l'
|
|
|
alias l.='ls -Ad .*'
|
|
|
@@ -80,18 +99,19 @@ alias mp='~/mplayer/mplayer/mplayer'
|
|
|
alias manmp='man -l ~/mplayer/mplayer/DOCS/man/en/mplayer.1'
|
|
|
alias mencoder='~/mplayer/mplayer/mencoder'
|
|
|
alias x264='~/x264/x264'
|
|
|
-alias gil='git log --graph --abbrev-commit --stat -C --decorate --date=local'
|
|
|
+alias gil='TZ=America/Los_Angeles git log --graph --abbrev-commit --stat -C --decorate --date=local'
|
|
|
alias gib='git branch -a'
|
|
|
alias gis='git status'
|
|
|
-alias gid='git diff -C --date=local'
|
|
|
-alias giw='git show -C --date=local --decorate'
|
|
|
+alias gid='TZ=America/Los_Angeles git diff -C --date=local'
|
|
|
+alias giw='TZ=America/Los_Angeles git show -C --date=local --decorate'
|
|
|
alias gic='git checkout'
|
|
|
-alias gibl='gil master..HEAD'
|
|
|
+alias gibl='TZ=America/Los_Angeles gil master..HEAD'
|
|
|
alias class='xprop -notype WM_CLASS'
|
|
|
alias tree='tree -AvL 10'
|
|
|
alias vil='vi *(.om[1])'
|
|
|
alias dt='gnome-terminal --hide-menubar'
|
|
|
alias sudovi='sudo vi -N -u /home/raylu/.vimrc'
|
|
|
+alias cda='cd ~/analytics'
|
|
|
function cl() {
|
|
|
if [ $# = 0 ]; then
|
|
|
cd && ls
|
|
|
@@ -106,7 +126,8 @@ function pdf() {
|
|
|
export GOPATH=$HOME
|
|
|
export PYTHONSTARTUP=$HOME/.pystartup.py
|
|
|
|
|
|
-PATH=$PATH:$HOME/go/bin:/sbin:/usr/sbin
|
|
|
+VIRTUAL_ENV="/home/raylu/env"
|
|
|
+PATH=$VIRTUAL_ENV/bin:$PATH:/sbin:/usr/sbin
|
|
|
if [ -d $HOME/bin ]; then
|
|
|
PATH=$HOME/bin:$PATH
|
|
|
fi
|