Merge branch 'master' of ssh://jonfu.com/home/jon/dots

bash/.bashrc

@@ -18,11 +18,11 @@ export LESS='-C -M -I -j 5 -# 4'
 
 # User specific aliases and functions
 alias l.='ls -lh --color=auto' 2>/dev/null
-alias l='ls -lh'
-alias ll='ls -lh'
-#set -o vi
+alias l='ls -lh --color=auto'
+alias ll='ls -lh --color=auto'
 alias p='ping'
 alias s='sudo'
+alias dmesg='dmesg -H'
 alias ip='ip -c'
 alias fart='/usr/bin/sleep'
 
@@ -33,9 +33,8 @@ export PATH=$GOPATH:$GOPATH/bin:$PATH
 export EDITOR=/usr/bin/vim
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+alias p='ping'
 
-#vi readline
-set -o vi
 #ctrl-x, ctrl-e to launch $EDITOR (vim)
 bind -m vi-insert '"\C-x\C-e": edit-and-execute-command'