X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=cadbafdfb169bf16ef3ef6298bbbbff679a41827;hp=cdc9a486730959a8aac250aba9bc395a7ce58ae4;hb=dcf4184728b3867fe3dfc1def3c8719f1420a0b4;hpb=6ddf81b842441b45ce8720deb458769d6b822f78

diff --git a/.bashrc b/.bashrc
index cdc9a48..cadbafd 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,7 +1,10 @@
+if [ -f /etc/bashrc ];then source /etc/bashrc;fi
+	
 alias ls='ls -bF'
 alias l='ls -lbF'
 alias maple="ssh1 -t -v vega.fjfi.cvut.cz maple"
 #alias cc='cc -I/home/short/include'
+alias vi='vim'
 
 weberr="/var/log/httpd/error/klokan.error_log"
 if [ -f "$weberr" ];then alias weberr='tail "$weberr"';fi