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

bash/.bashrc

@@ -8,13 +8,25 @@ fi
 # Uncomment the following line if you don't like systemctl's auto-paging feature:
 #export SYSTEMD_PAGER=
 
+#pager setup
+#-C faster reprints
+#-M more status
+#-I case insensitive
+#-j 5 show X lines above search for context
+## 4 - right/left four chars
+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 --color=auto'
 alias ll='ls -lh --color=auto'
 alias p='ping'
 alias s='sudo'
+<<<<<<< HEAD
 alias dmesg='dmesg -H'
+=======
+alias ip='ip -c'
+>>>>>>> 36ce64ada64d0d9adc019885f6013b8b016e46e3
 
 #golang stuff
 export GOPATH=$HOME/gopath